]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
icmp6-util: port to recvmsg_safe()
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Apr 2020 17:53:27 +0000 (19:53 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 24 Apr 2020 05:41:32 +0000 (07:41 +0200)
Split out of #15457, let's see if this is the culprit of the CI failure.

src/libsystemd-network/icmp6-util.c

index dbb1e51a0e0d9567d59706d4591d551d34f4cdb6..1a51c22a8d09c5943163ad9fdbd0e2603a6d0c10 100644 (file)
@@ -167,9 +167,9 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst,
 
         iov = IOVEC_MAKE(buffer, size);
 
-        len = recvmsg(fd, &msg, MSG_DONTWAIT);
+        len = recvmsg_safe(fd, &msg, MSG_DONTWAIT);
         if (len < 0)
-                return -errno;
+                return (int) len;
 
         if ((size_t) len != size)
                 return -EINVAL;