From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 1 Feb 2016 21:13:45 +0000 (+0100)
Subject: sd-netlink: don't take possesion of netlink fd from caller on failure
X-Git-Tag: v229~50^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c60db874d143bde29212d21b6d2af4da1a43555;p=thirdparty%2Fsystemd.git

sd-netlink: don't take possesion of netlink fd from caller on failure

Fixes: #2338
---

diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 15d387df2c3..ab42b96a2ec 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -118,8 +118,10 @@ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         rtnl->fd = fd;
 
         r = socket_bind(rtnl);
-        if (r < 0)
+        if (r < 0) {
+                rtnl->fd = -1; /* on failure, the caller remains owner of the fd, hence don't close it here */
                 return r;
+        }
 
         *ret = rtnl;
         rtnl = NULL;