]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-netlink: since whe acquire the netlink socket's sockaddr anyway, let's actually...
authorLennart Poettering <lennart@poettering.net>
Mon, 1 Feb 2016 21:17:35 +0000 (22:17 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 1 Feb 2016 21:18:16 +0000 (22:18 +0100)
src/libsystemd/sd-netlink/sd-netlink.c

index ab42b96a2ec59650b13da725da9d07f1d3f10b65..d3eb379c9acd9e39d027cb77b9619c6937bb9eb7 100644 (file)
@@ -44,11 +44,8 @@ static int sd_netlink_new(sd_netlink **ret) {
                 return -ENOMEM;
 
         rtnl->n_ref = REFCNT_INIT;
-
         rtnl->fd = -1;
-
         rtnl->sockaddr.nl.nl_family = AF_NETLINK;
-
         rtnl->original_pid = getpid();
 
         LIST_HEAD_INIT(rtnl->match_callbacks);
@@ -87,6 +84,9 @@ int sd_netlink_new_from_netlink(sd_netlink **ret, int fd) {
         if (r < 0)
                 return -errno;
 
+        if (rtnl->sockaddr.nl.nl_family != AF_NETLINK)
+                return -EINVAL;
+
         rtnl->fd = fd;
 
         *ret = rtnl;