From 00ca860b2c8582d6dbd6538058f4702bb407bb05 Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@redhat.com>
Date: Wed, 2 Sep 2026 12:25:35 +0200
Subject: [PATCH] ndisc: fix an out of memory condition

... and skip the loop when building NDisc option fails.
---
 src/libsystemd-network/ndisc-option.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libsystemd-network/ndisc-option.c b/src/libsystemd-network/ndisc-option.c
index ef441b706b..57418c0064 100644
--- a/src/libsystemd-network/ndisc-option.c
+++ b/src/libsystemd-network/ndisc-option.c
@@ -882,7 +882,7 @@ static int ndisc_option_build_flags_extension(const sd_ndisc_option *option, uin
 
         _cleanup_free_ uint8_t *buf = new(uint8_t, 8);
         if (!buf)
-                return 0;
+                return -ENOMEM;
 
         unaligned_write_be64(buf, (option->extended_flags & UINT64_C(0x00ffffffffffff00)) << 8);
         buf[0] = SD_NDISC_OPTION_FLAGS_EXTENSION;
@@ -1794,8 +1794,10 @@ int ndisc_send(int fd, const struct in6_addr *dst, const struct icmp6_hdr *hdr,
                 }
                 if (r == -ENOMEM)
                         return log_oom_debug();
-                if (r < 0)
+                if (r < 0) {
                         log_debug_errno(r, "Failed to build NDisc option %u, ignoring: %m", option->type);
+                        continue;
+                }
 
                 iov[n_iov++] = IOVEC_MAKE(buf, buf[1] * 8);
                 TAKE_PTR(buf);