From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 23 Mar 2018 08:47:04 +0000 (+0100)
Subject: stat-util: fix fd_is_network_ns()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=504cb982f882169fc0adf9a2151a4331d339056d;p=elogind.git

stat-util: fix fd_is_network_ns()

This was broken in 77f9fa3b8ea46c27e5a5e9270f71bf1b4000c3e0. My fault.

Fixes: #8543
(cherry picked from commit 29f74559d4dc6ea41232233d32f1a92bcee43626)
---

diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 313ed4f2c..703368528 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -265,7 +265,8 @@ int fd_is_network_ns(int fd) {
         if (r <= 0)
                 return r;
 
-        if (ioctl(fd, NS_GET_NSTYPE) < 0)
+        r = ioctl(fd, NS_GET_NSTYPE);
+        if (r < 0)
                 return -errno;
 
         return r == CLONE_NEWNET;