From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 26 Aug 2015 21:26:01 +0000 (+0200)
Subject: dhcp: properly handle error from ioctl()
X-Git-Tag: v226~89^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966d74c043098e12d4d5b101aa7650244c14b815;p=thirdparty%2Fsystemd.git

dhcp: properly handle error from ioctl()
---

diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 968df1f43d4..8f6da4bc003 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -901,13 +901,12 @@ static int server_receive_message(sd_event_source *s, int fd,
                 .msg_controllen = sizeof(cmsgbuf),
         };
         struct cmsghdr *cmsg;
-        int buflen = 0, len, r;
+        int buflen = 0, len;
 
         assert(server);
 
-        r = ioctl(fd, FIONREAD, &buflen);
-        if (r < 0)
-                return r;
+        if (ioctl(fd, FIONREAD, &buflen) < 0)
+                return -errno;
         if (buflen < 0)
                 return -EIO;