From: Carlos O'Donell <carlos@redhat.com>
To: Michael Hudson-Doyle <michael.hudson@canonical.com>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v3] linux: return UNSUPPORTED from tst-mount if entering mount namespace fails
Date: Mon, 18 Jul 2022 08:59:16 -0400 [thread overview]
Message-ID: <1bdca5bc-8b4d-dc09-19ea-7bb8d9735ef7@redhat.com> (raw)
In-Reply-To: <20220717231657.1269920-1-michael.hudson@canonical.com>
On 7/17/22 19:16, Michael Hudson-Doyle via Libc-alpha wrote:
> Before this the test fails if run in a chroot by a non-root user:
LGTM. OK for glibc 2.36. Would you like me to push this for you?
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> warning: could not become root outside namespace (Operation not permitted)
> ../sysdeps/unix/sysv/linux/tst-mount.c:36: numeric comparison failure
> left: 1 (0x1); from: errno
> right: 19 (0x13); from: ENODEV
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:39: not true: fd != -1
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:46: not true: r != -1
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:48: not true: r != -1
> ../sysdeps/unix/sysv/linux/tst-mount.c:52: numeric comparison failure
> left: 1 (0x1); from: errno
> right: 9 (0x9); from: EBADF
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:55: not true: mfd != -1
> ../sysdeps/unix/sysv/linux/tst-mount.c:58: numeric comparison failure
> left: 1 (0x1); from: errno
> right: 2 (0x2); from: ENOENT
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:61: not true: r != -1
> ../sysdeps/unix/sysv/linux/tst-mount.c:65: numeric comparison failure
> left: 1 (0x1); from: errno
> right: 2 (0x2); from: ENOENT
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:68: not true: pfd != -1
> error: ../sysdeps/unix/sysv/linux/tst-mount.c:75: not true: fd_tree != -1
> ../sysdeps/unix/sysv/linux/tst-mount.c:88: numeric comparison failure
> left: 1 (0x1); from: errno
> right: 38 (0x26); from: ENOSYS
> error: 12 test failures
>
> Checking that the test can enter a new mount namespace is more correct
> than just checking the return value of support_become_root() as the test
> code changes the mount namespace it runs in so running it as root on a
> system that does not support mount namespaces should still skip.
Agreed.
>
> Also change the test to remove the unnecessary fork.
> ---
> v3: check support_enter_mount_namespace() return value, remove fork
> v2: check support_can_chroot() rather than support_become_root return
> value
> ---
> sysdeps/unix/sysv/linux/tst-mount.c | 25 ++++++-------------------
> 1 file changed, 6 insertions(+), 19 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/tst-mount.c b/sysdeps/unix/sysv/linux/tst-mount.c
> index 502d7e3433..b6333a60e6 100644
> --- a/sysdeps/unix/sysv/linux/tst-mount.c
> +++ b/sysdeps/unix/sysv/linux/tst-mount.c
> @@ -20,15 +20,18 @@
> #include <support/check.h>
> #include <support/xunistd.h>
> #include <support/namespace.h>
> -#include <sys/wait.h>
OK.
> #include <sys/mount.h>
>
> _Static_assert (sizeof (struct mount_attr) == MOUNT_ATTR_SIZE_VER0,
> "sizeof (struct mount_attr) != MOUNT_ATTR_SIZE_VER0");
>
> -static void
> -subprocess (void)
> +static int
> +do_test (void)
OK.
> {
> + support_become_root ();
> + if (!support_enter_mount_namespace ())
> + FAIL_UNSUPPORTED ("cannot enter mount namespace, skipping test");
OK.
> +
> int r = fsopen ("it_should_be_not_a_valid_mount", 0);
> TEST_VERIFY_EXIT (r == -1);
> if (errno == ENOSYS)
> @@ -100,20 +103,4 @@ subprocess (void)
> _exit (0);
> }
>
> -static int
> -do_test (void)
> -{
> - support_become_root ();
> -
> - pid_t pid = xfork ();
> - if (pid == 0)
> - subprocess ();
> -
> - int status;
> - xwaitpid (pid, &status, 0);
> - TEST_VERIFY (WIFEXITED (status));
> -
> - return 0;
> -}
> -
> #include <support/test-driver.c>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2022-07-18 12:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 3:23 [PATCH] linux: return UNSUPPORTED in tst-mount if support_become_root fails Michael Hudson-Doyle
2022-07-14 11:24 ` Adhemerval Zanella Netto
2022-07-14 19:03 ` Carlos O'Donell
2022-07-14 19:18 ` DJ Delorie
2022-07-14 22:50 ` Michael Hudson-Doyle
2022-07-14 23:16 ` DJ Delorie
2022-07-15 0:06 ` [PATCH v2] linux: return UNSUPPORTED in tst-mount if !support_can_chroot Michael Hudson-Doyle
2022-07-15 7:07 ` Florian Weimer
2022-07-15 15:35 ` Carlos O'Donell
2022-07-15 15:44 ` Florian Weimer
2022-07-17 21:44 ` Michael Hudson-Doyle
2022-07-15 21:01 ` Michael Hudson-Doyle
2022-07-16 0:26 ` Carlos O'Donell
2022-07-17 23:16 ` [PATCH v3] linux: return UNSUPPORTED from tst-mount if entering mount namespace fails Michael Hudson-Doyle
2022-07-18 12:59 ` Carlos O'Donell [this message]
2022-07-18 18:59 ` Michael Hudson-Doyle
2022-07-19 2:51 ` Carlos O'Donell
2022-07-18 13:13 ` Mark Wielaard
2022-07-18 13:45 ` Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1bdca5bc-8b4d-dc09-19ea-7bb8d9735ef7@redhat.com \
--to=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=michael.hudson@canonical.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).