From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 11 Mar 2020 01:35:51 +0000 (+0100)
Subject: af_unix: fix return value
X-Git-Tag: lxc-4.0.0~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fb40573e59579e049cb11c5dbb0b726d824af0c;p=thirdparty%2Flxc.git

af_unix: fix return value

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c
index e70e0c9e2..04aef44ad 100644
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -191,9 +191,8 @@ static int lxc_abstract_unix_recv_fds_iov(int fd, int *recvfds, int num_recvfds,
 	do {
 		ret = recvmsg(fd, &msg, 0);
 	} while (ret < 0 && errno == EINTR);
-	if (!ret)
-		return 0;
-
+	if (ret < 0 || ret == 0)
+		return ret;
 
 	/*
 	 * If SO_PASSCRED is set we will always get a ucred message.