]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lsns: tolerate lsns_ioctl(fd, NS_GET_{PARENT,USERNS}) failing with ENOSYS
authorMasatake YAMATO <yamato@redhat.com>
Sat, 13 Apr 2024 16:40:14 +0000 (01:40 +0900)
committerMasatake YAMATO <yamato@redhat.com>
Sun, 14 Apr 2024 17:05:32 +0000 (02:05 +0900)
With the original code, "lsns/filedesc" test case failed on
"build (qemu-user, s390x)" and "build (qemu-user, riscv64)".

On the platforms, lsns_ioctl(fd, NS_GET_{PARENT,USERNS}) failed
with ENOSYS. The error stoped the iteration for gathering
information from /proc/[0-9]+. As a result, lsns printed
nothing. We don't expect this behavior.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
sys-utils/lsns.c

index 2c4ec9da0ea81ed19b3b779d6b1deeaa56a3764e..8b70fd7cdb470f4e7c005121b17c88416e211ac8 100644 (file)
@@ -319,7 +319,11 @@ static int get_ns_ino(struct path_cxt *pc, const char *nsname, ino_t *ino, ino_t
                return -errno;
        if (strcmp(nsname, "pid") == 0 || strcmp(nsname, "user") == 0) {
                if ((pfd = lsns_ioctl(fd, NS_GET_PARENT)) < 0) {
-                       if (errno == EPERM)
+                       if (errno == EPERM
+                           /* On the test platforms, "build (qemu-user, s390x)" and
+                            * "build (qemu-user, riscv64)", the ioctl reported ENOSYS.
+                            */
+                           || errno == ENOSYS)
                                goto user;
                        close(fd);
                        return -errno;
@@ -334,7 +338,11 @@ static int get_ns_ino(struct path_cxt *pc, const char *nsname, ino_t *ino, ino_t
        }
  user:
        if ((ofd = lsns_ioctl(fd, NS_GET_USERNS)) < 0) {
-               if (errno == EPERM)
+               if (errno == EPERM
+                   /* On the test platforms, "build (qemu-user, s390x)" and
+                    * "build (qemu-user, riscv64)", the ioctl reported ENOSYS.
+                    */
+                   || errno == ENOSYS)
                        goto out;
                close(fd);
                return -errno;