From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Feb 2021 17:11:20 +0000 (+0100)
Subject: sd-netlink: use getsockopt_int() where appropriate
X-Git-Tag: v248-rc1~156^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13ec9f103b53ecc555a16048c3901d3320b26ef3;p=thirdparty%2Fsystemd.git

sd-netlink: use getsockopt_int() where appropriate
---

diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 6220798b76f..b0a1eb77ec7 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -92,9 +92,7 @@ static bool rtnl_pid_changed(const sd_netlink *rtnl) {
 
 int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
-        int r;
-        int protocol;
-        socklen_t l;
+        int r, protocol;
 
         assert_return(ret, -EINVAL);
         assert_return(fd >= 0, -EBADF);
@@ -103,8 +101,7 @@ int sd_netlink_open_fd(sd_netlink **ret, int fd) {
         if (r < 0)
                 return r;
 
-        l = sizeof(protocol);
-        r = getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &l);
+        r = getsockopt_int(fd, SOL_SOCKET, SO_PROTOCOL, &protocol);
         if (r < 0)
                 return r;