From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 17 Apr 2025 06:15:11 +0000 (+0200)
Subject: Revert "sd-netlink: prepare buffer for dropping unexpected message"
X-Git-Tag: v258-rc1~799^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d88e4a4b43800ad2e5b6570052ef7e1c70b4d41;p=thirdparty%2Fsystemd.git

Revert "sd-netlink: prepare buffer for dropping unexpected message"

This reverts commit bf478dcffbc3c568fb3a3c8e8b93b3e7b66f4228.

I think we should avoid allocating memory needlessly just to free it
again, in particular if this can be triggered by some rogue peer.
---

diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c
index 5959959f427..9d2b3984c2b 100644
--- a/src/libsystemd/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/sd-netlink/netlink-socket.c
@@ -181,12 +181,6 @@ 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 */
                         n = recvmsg_safe(fd, &msg, 0);
                         if (n < 0)