From: Tom Gundersen <teg@jklm.no>
Date: Fri, 6 Feb 2015 10:54:30 +0000 (+0100)
Subject: sd-rtnl: don't fall over when receiving 0 bytes from the socket
X-Git-Tag: v219~127
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=da53c5516e3807145a321df08b853d6f9f21c6fc

sd-rtnl: don't fall over when receiving 0 bytes from the socket

causes EOF. Seems like a kernel bug. Ignoring it seems to work be the best we
can do for now...

See https://bugs.freedesktop.org/show_bug.cgi?id=88397
---

diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 23253029e..f07289943 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -1350,9 +1350,11 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
                         log_debug("rtnl: no data in socket");
 
                 return (errno == EAGAIN || errno == EINTR) ? 0 : -errno;
-        } else if (r == 0)
-                /* connection was closed by the kernel */
-                return -ECONNRESET;
+        } else if (r == 0) {
+                /* connection was closed by the kernel? */
+                log_warning("rtnl: ignoring empty message");
+                return 0;
+        }
 
         for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
                 if (cmsg->cmsg_level == SOL_SOCKET &&