From: Jim Meyering <meyering@redhat.com>
Date: Thu, 20 May 2010 12:30:36 +0000 (+0200)
Subject: lxc_controller.c: don't ignore failed "accept"
X-Git-Tag: v0.8.2~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6fc519cdf3039fa15b080ea9f2afbc177d123c;p=thirdparty%2Flibvirt.git

lxc_controller.c: don't ignore failed "accept"

* src/lxc/lxc_controller.c (ignorable_epoll_accept_errno): New function.
(lxcControllerMain): Handle a failed accept carefully:
most errno values indicate legitimate failure and must be fatal.
However, ignore a special case: that in which an incoming client quits
between the poll() indicating its presence, and our accept() which
is trying to process it.
---

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 1732780c1a..23fda7f763 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -269,6 +269,17 @@ typedef struct _lxcTtyForwardFd_t {
     int active;
 } lxcTtyForwardFd_t;
 
+/* Return true if it is ok to ignore an accept-after-epoll syscall
+   that fails with the specified errno value.  Else false.  */
+static bool
+ignorable_epoll_accept_errno(int errnum)
+{
+  return (errnum == EINVAL
+          || errnum == ECONNABORTED
+          || errnum == EAGAIN
+          || errnum == EWOULDBLOCK);
+}
+
 /**
  * lxcControllerMain
  * @monitor: server socket fd to accept client requests
@@ -350,6 +361,18 @@ static int lxcControllerMain(int monitor,
         if (numEvents > 0) {
             if (epollEvent.data.fd == monitor) {
                 int fd = accept(monitor, NULL, 0);
+                if (fd < 0) {
+                    /* First reflex may be simply to declare accept failure
+                       to be a fatal error.  However, accept may fail when
+                       a client quits between the above epoll_wait and here.
+                       That case is not fatal, but rather to be expected,
+                       if not common, so ignore it.  */
+                    if (ignorable_epoll_accept_errno(errno))
+                        continue;
+                    virReportSystemError(errno, "%s",
+                                         _("accept(monitor,...) failed"));
+                    goto cleanup;
+                }
                 if (client != -1) { /* Already connected, so kick new one out */
                     close(fd);
                     continue;