sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

s3: Fix a winbind race leading to 100% CPU

Browse Source 
This fixes a race condition that leads to the winbindd_children list becoming
corrupted. It happens when on a busy winbind SIGCHLD is a bit late.

Imagine a winbind with multiple requests in the queue for a single child. Child
dies, and before the SIGCHLD handler is called we find the socket to be dead.
wb_child_request_done is called, receiving an error from wb_simple_trans_recv.
It closes the socket. Then immediately the wb_child_request_trigger will do
another fork_domain_child before the signal handler is called. This means that
we do another fork_domain_child, we have child->sock==-1 at this point.
fork_domain_child will do a DLIST_ADD(winbindd_children, child) a second time
where the child is already part of that list. This corrupts the list. Then the
signal handler kicks in, spinning in

for (child = winbindd_children; child != NULL; child = child->next) {

forever. Not good. This patch makes sure that both conditions (sock==-1 and not
part of the list) for a winbindd_child struct match up.

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Fri Aug 26 18:51:24 CEST 2011 on sn-devel-104
This commit is contained in:
Volker Lendecke 2011-08-26 16:54:18 +02:00 committed by Volker Lendecke
parent b72944fea7
commit ed058f4dc3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/winbindd/winbindd_dual.c
View File

@ -43,6 +43,8 @@
extern bool override_logfile;
extern struct winbindd_methods cache_methods;
static struct winbindd_child *winbindd_children = NULL;
/* Read some data from a client connection */
static NTSTATUS child_read_request(struct winbindd_cli_state *state)
@ -171,6 +173,7 @@ static void wb_child_request_done(struct tevent_req *subreq)
*/
close(state->child->sock);
state->child->sock = -1;
DLIST_REMOVE(winbindd_children, state->child);
tevent_req_error(req, err);
return;
}
@ -489,8 +492,6 @@ void setup_child(struct winbindd_domain *domain, struct winbindd_child *child,
SMB_ASSERT(child->binding_handle != NULL);
}
static struct winbindd_child *winbindd_children = NULL;
void winbind_child_died(pid_t pid)
{
struct winbindd_child *child;