From: Tom Gundersen <teg@jklm.no>
Date: Sun, 28 Dec 2014 23:24:00 +0000 (+0100)
Subject: sd-rtnl: recv_message - drop message when peeking fails
X-Git-Tag: v219~776
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c7460cce79fd358f2745bd390bd2e7ded450ee62;p=elogind.git

sd-rtnl: recv_message - drop message when peeking fails

Read the message form the socket or we will loop trying to read the
same message repeatedly.
---

diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 92f318267..640c0ea93 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -1377,9 +1377,17 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
                 }
         }
 
-        if (!auth)
+        if (!auth) {
                 /* not from the kernel, ignore */
+                if (peek) {
+                        /* drop the message */
+                        r = recvmsg(fd, &msg, 0);
+                        if (r < 0)
+                                return (errno == EAGAIN || errno == EINTR) ? 0 : -errno;
+                }
+
                 return 0;
+        }
 
         if (group)
                 *_group = group;