shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 18:27:04 +03:00
Code

sd-rtnl: don't treat 0-length messages specially

Browse Source 
Still parse the CMSG data, and most importantly make sure we drop the message when peeking.
This commit is contained in:
Tom Gundersen 2015-02-06 14:43:17 +01:00
parent b99802f769
commit b8719ebb57
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-rtnl/rtnl-message.c
View File

@ -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"); log_debug("rtnl: no data in socket");
return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; 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)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {