From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2024 21:00:29 +0000 (+0900)
Subject: network: remove unexpected netlink socket from service manager
X-Git-Tag: v257-rc1~33^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae659748835644e3a9a3dd9631aa18e7dc201a11;p=thirdparty%2Fsystemd.git

network: remove unexpected netlink socket from service manager
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 15a309c82f1..6dce901742c 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -238,8 +238,7 @@ static int manager_listen_fds(Manager *m, int *ret_rtnl_fd) {
                 if (sd_is_socket(fd, AF_NETLINK, SOCK_RAW, -1) > 0) {
                         if (rtnl_fd >= 0) {
                                 log_debug("Received multiple netlink socket, ignoring.");
-                                safe_close(fd);
-                                continue;
+                                goto unused;
                         }
 
                         rtnl_fd = fd;
@@ -249,6 +248,7 @@ static int manager_listen_fds(Manager *m, int *ret_rtnl_fd) {
                 if (manager_add_tuntap_fd(m, fd, names[i]) >= 0)
                         continue;
 
+        unused:
                 if (m->test_mode)
                         safe_close(fd);
                 else