morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-netlink: don't fail on netlink message truncation if we pass a zero sized buffer (#37165)

Browse Source 
Alternative to #37163
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-04-17 13:11:13 +02:00
committed by GitHub
parent bf478dcffb 90755dac69
commit 60bcd98228
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libsystemd/sd-netlink/netlink-socket.c
View File

@@ -162,11 +162,8 @@ static int socket_recv_message(int fd, void *buf, size_t buf_size, uint32_t *ret
assert(peek || (buf && buf_size > 0));
n = recvmsg_safe(fd, &msg, peek ? (MSG_PEEK|MSG_TRUNC) : 0);
if (ERRNO_IS_NEG_TRANSIENT(n)) {
if (ret_mcast_group)
*ret_mcast_group = 0;
return 0;
}
if (ERRNO_IS_NEG_TRANSIENT(n))
goto transient;
if (n == -ENOBUFS)
return log_debug_errno(n, "sd-netlink: kernel receive buffer overrun");
if (n == -ECHRNG)
@@ -181,21 +178,15 @@ static int socket_recv_message(int fd, void *buf, size_t buf_size, uint32_t *ret
log_debug("sd-netlink: ignoring message from PID %"PRIu32, sender.nl.nl_pid);
if (peek) {
_cleanup_free_ uint8_t *b = new(uint8_t, n);
if (!b)
return -ENOMEM;
iov = IOVEC_MAKE(b, n);
/* drop the message */
/* Drop the message. Note that we ignore ECHRNG/EXFULL errors here, which
* recvmsg_safe() returns in case the payload or cdata is truncated. Here it's quite
* likely it is truncated, because we pass a zero-sized buffer. */
n = recvmsg_safe(fd, &msg, 0);
if (n < 0)
if (n < 0 && !IN_SET(n, -ECHRNG, -EXFULL))
return (int) n;
}
if (ret_mcast_group)
*ret_mcast_group = 0;
return 0;
goto transient;
}
if (ret_mcast_group) {
@@ -209,6 +200,12 @@ static int socket_recv_message(int fd, void *buf, size_t buf_size, uint32_t *ret
}
return (int) n;
transient:
if (ret_mcast_group)
*ret_mcast_group = 0;
return 0;
}
DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(