From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Sep 2022 16:25:37 +0000 (+0200)
Subject: uid-range: error code tweak for uid_range_load_userns()
X-Git-Tag: v252-rc1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdba12b34f4281fcec06881955b7e56950c03bea;p=thirdparty%2Fsystemd.git

uid-range: error code tweak for uid_range_load_userns()

Let's return ENOSYS if /proc/ is not mounted (as that's what we usually
return in that case in various helpers that operate on /proc/). Return
EOPNOTSUPP if the kernel simply doesn't support userns.
---

diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
index 1b4396a34cc..630bf42f92e 100644
--- a/src/shared/uid-range.c
+++ b/src/shared/uid-range.c
@@ -212,8 +212,8 @@ int uid_range_load_userns(UidRange **p, size_t *n, const char *path) {
         if (!f) {
                 r = -errno;
 
-                if (r == -ENOENT && path_startswith(path, "/proc/") && proc_mounted() > 0)
-                        return -EOPNOTSUPP;
+                if (r == -ENOENT && path_startswith(path, "/proc/"))
+                        return proc_mounted() > 0 ? -EOPNOTSUPP : -ENOSYS;
 
                 return r;
         }