diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-02-12 11:44:48 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-12 11:45:39 +0100 |
| commit | a38d99451f2bf8026ec51aee91662292e823c6a8 (patch) | |
| tree | 312f02b7057b65dbaf42c796f814f43b064ef9ab /src/libsystemd/sd-rtnl | |
| parent | d01efa07444e49aafd78e0aa822168da688d53f5 (diff) | |
Revert "tree-wide: Always use recvmsg with MSG_CMSG_CLOEXEC"
This reverts commit d6d810fbf8071f8510450dbacd1d083f37603656.
It's apparently not OK to pass MSG_CMSG_CLOEXEC to recvmsg() of raw
sockets.
Diffstat (limited to 'src/libsystemd/sd-rtnl')
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index e7e3799286..276591f31b 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -1431,7 +1431,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool assert(fd >= 0); assert(iov); - r = recvmsg(fd, &msg, MSG_TRUNC | MSG_CMSG_CLOEXEC | (peek ? MSG_PEEK : 0)); + r = recvmsg(fd, &msg, MSG_TRUNC | (peek ? MSG_PEEK : 0)); if (r < 0) { /* no data */ if (errno == ENOBUFS) @@ -1467,7 +1467,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool /* not from the kernel, ignore */ if (peek) { /* drop the message */ - r = recvmsg(fd, &msg, MSG_CMSG_CLOEXEC); + r = recvmsg(fd, &msg, 0); if (r < 0) return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; } |