From c7460cce79fd358f2745bd390bd2e7ded450ee62 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 29 Dec 2014 00:24:00 +0100 Subject: [PATCH] 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. --- src/libsystemd/sd-rtnl/rtnl-message.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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; -- 2.30.2