From b8719ebb57961f93a9aeeb49f0b9ba1f2bab7068 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 6 Feb 2015 14:43:17 +0100 Subject: [PATCH] sd-rtnl: don't treat 0-length messages specially Still parse the CMSG data, and most importantly make sure we drop the message when peeking. --- src/libsystemd/sd-rtnl/rtnl-message.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index f07289943..14a52dfae 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -1350,10 +1350,6 @@ 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? */ - log_warning("rtnl: ignoring empty message"); - return 0; } for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { -- 2.30.2