diff options
| author | Andreas Schneider <asn@samba.org> | 2015-03-26 10:48:31 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-04-08 21:34:26 +0200 |
| commit | c2ea20726f316b0c232ec26f46258a53628885a6 (patch) | |
| tree | 177f0fda25fc0bf9ca539a63754f4194291e6870 /source4 | |
| parent | ef714b3f607f8ab4b233cf0c9552f06bb95693db (diff) | |
| download | samba-c2ea20726f316b0c232ec26f46258a53628885a6.tar.gz | |
s4-process_model: Do not close random fds while forking.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11180
The issue has been found with nss_wrapper debug output running:
samba4.ntvfs.cifs.krb5.base.lock
In the case here, we fork a child and close the fd without resetting
the pipe fd variable. Then the fd was used to open the nss_wrapper
hosts file which got the same fd. We forked again in the process model
called close() on the re-used fd (of the pipe variable) again without
nss_wrapper noticing. Now Samba opened the secrets tdb and got
the same fd as nss_wrapper was using for the hosts file and next
nss_wrapper tried to parse a TDB ...
Pair-Programmed-With: Michael Adam <obnox@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit f75182841d4a7d63bd070022270926e324631fa9)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/smbd/process_standard.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index c5377b34e08..cbc63b6db1a 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -34,7 +34,7 @@ NTSTATUS process_model_standard_init(void); /* we hold a pipe open in the parent, and the any child processes wait for EOF on that pipe. This ensures that children die when the parent dies */ -static int child_pipe[2]; +static int child_pipe[2] = { -1, -1 }; /* called when the process model is selected @@ -112,7 +112,10 @@ static void standard_accept_connection(struct tevent_context *ev, tevent_add_fd(ev, ev, child_pipe[0], TEVENT_FD_READ, standard_pipe_handler, NULL); - close(child_pipe[1]); + if (child_pipe[1] != -1) { + close(child_pipe[1]); + child_pipe[1] = -1; + } /* Ensure that the forked children do not expose identical random streams */ set_need_random_reseed(); @@ -170,7 +173,10 @@ static void standard_new_task(struct tevent_context *ev, tevent_add_fd(ev, ev, child_pipe[0], TEVENT_FD_READ, standard_pipe_handler, NULL); - close(child_pipe[1]); + if (child_pipe[1] != -1) { + close(child_pipe[1]); + child_pipe[1] = -1; + } /* Ensure that the forked children do not expose identical random streams */ set_need_random_reseed(); |