]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: remove unexpected netlink socket from service manager
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 1 Nov 2024 21:00:29 +0000 (06:00 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 4 Nov 2024 17:55:15 +0000 (02:55 +0900)
src/network/networkd-manager.c

index 15a309c82f10e7f55dc7ee6f126a1e36cbd1a685..6dce901742c277265e79b91968250437bfda7bf7 100644 (file)
@@ -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