From 03421944b2bd82caf13946b745e4d634f0559f82 Mon Sep 17 00:00:00 2001 From: todd stecher Date: Thu, 12 Feb 2009 00:11:38 -0800 Subject: S3: Stop creating SMBD cores when failing to create a pipe. This was uncovered when the MAX FD limit was hit, causing an instant core and invoking error reporting. This fix causes SMBD to exit, but without building a core. --- source3/lib/select.c | 12 +++++++++++- source3/printing/printing.c | 10 +++++++--- source3/smbd/server.c | 4 ++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/source3/lib/select.c b/source3/lib/select.c index 14e59257ba..a58530af8d 100644 --- a/source3/lib/select.c +++ b/source3/lib/select.c @@ -59,7 +59,17 @@ int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, s if (initialised != sys_getpid()) { if (pipe(select_pipe) == -1) - smb_panic("Could not create select pipe"); + { + DEBUG(0, ("sys_select: pipe failed (%s)\n", + strerror(errno))); + if (readfds != NULL) + FD_ZERO(readfds); + if (writefds != NULL) + FD_ZERO(writefds); + if (errorfds != NULL) + FD_ZERO(errorfds); + return -1; + } /* * These next two lines seem to fix a bug with the Linux diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 17ddc55efa..7179184b73 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -1478,9 +1478,13 @@ void start_background_queue(void) ret = sys_select(maxfd, &r_fds, &w_fds, NULL, &to); - /* If pause_pipe[1] is closed it means the parent smbd - * and children exited or aborted. */ - if (ret == 1 && FD_ISSET(pause_pipe[1], &r_fds)) { + /* + * If pause_pipe[1] is closed it means the parent smbd + * and children exited or aborted. If sys_select() + * failed, then something more sinister is wrong + */ + if ((ret < 0) || + (ret == 1 && FD_ISSET(pause_pipe[1], &r_fds))) { exit_server_cleanly(NULL); } diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 76dab96ad9..e8ccba0873 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -694,6 +694,10 @@ static void smbd_parent_loop(struct smbd_parent_context *parent) continue; } + /* socket error */ + if (num < 0) + exit_server_cleanly("socket error"); + /* If the idle timeout fired and we don't have any connected * users, exit gracefully. We should be running under a process * controller that will restart us if necessry. -- cgit