From b491454dfc5d8081ef429af1d1a01aed0b83bd25 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 25 Nov 2022 03:33:52 +0900 Subject: [PATCH] sd-netlink: return earlier when received invalid message --- src/libsystemd/sd-netlink/netlink-socket.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index 55dc51ab502..5128f8fb4be 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -272,7 +272,12 @@ int socket_read_message(sd_netlink *nl) { return r; len = (size_t) r; - if (NLMSG_OK(nl->rbuffer, len) && nl->rbuffer->nlmsg_flags & NLM_F_MULTI) { + if (!NLMSG_OK(nl->rbuffer, len)) { + log_debug("sd-netlink: received invalid message, discarding %zu bytes of incoming message", len); + return 0; + } + + if (nl->rbuffer->nlmsg_flags & NLM_F_MULTI) { multi_part = true; for (i = 0; i < nl->rqueue_partial_size; i++) @@ -341,7 +346,7 @@ int socket_read_message(sd_netlink *nl) { } if (len > 0) - log_debug("sd-netlink: discarding %zu bytes of incoming message", len); + log_debug("sd-netlink: discarding trailing %zu bytes of incoming message", len); if (!first) return 0; -- 2.47.3