dhcp: properly handle error from ioctl()
authorLennart Poettering <lennart@poettering.net>
Wed, 26 Aug 2015 21:26:01 +0000 (23:26 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 26 Aug 2015 21:26:01 +0000 (23:26 +0200)
src/libsystemd-network/sd-dhcp-server.c

index 968df1f..8f6da4b 100644 (file)
@@ -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;