From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Apr 2020 17:53:27 +0000 (+0200)
Subject: icmp6-util: port to recvmsg_safe()
X-Git-Tag: v246-rc1~499
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2adfd1bda1875c4365d0480674725e1fdccf7177;p=thirdparty%2Fsystemd.git

icmp6-util: port to recvmsg_safe()

Split out of #15457, let's see if this is the culprit of the CI failure.
---

diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c
index dbb1e51a0e0..1a51c22a8d0 100644
--- a/src/libsystemd-network/icmp6-util.c
+++ b/src/libsystemd-network/icmp6-util.c
@@ -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;