From: Kai Ruhnau <Kai.Ruhnau@live.com>
Date: Wed, 15 Jun 2016 10:33:24 +0000 (+0200)
Subject: socket-util: Run the fallback when the kernel complains about the null buffer (#3541)
X-Git-Tag: v231.3~94
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8e672b6af770c75a69b1a026cbfef7f1ff6e598c;ds=sidebyside

socket-util: Run the fallback when the kernel complains about the null buffer (#3541)

Calling recv with a NULL buffer returns EFAULT instead of EOPNOTSUPP on
older kernels (3.14).

Fixes #3407

Signed-off-by: Kai Ruhnau <kai.ruhnau@target-sg.com>
---

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 86d6e3f6e..f47a8f04e 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -991,7 +991,7 @@ ssize_t next_datagram_size_fd(int fd) {
 
         l = recv(fd, NULL, 0, MSG_PEEK|MSG_TRUNC);
         if (l < 0) {
-                if (errno == EOPNOTSUPP)
+                if (errno == EOPNOTSUPP || errno == EFAULT)
                         goto fallback;
 
                 return -errno;