From: Aurelien Jarno <aurelien@aurel32.net>
To: libc-stable@sourceware.org
Cc: Florian Weimer <fweimer@redhat.com>,
Siddhesh Poyarekar <siddhesh@sourceware.org>
Subject: [COMMITTED 2.33 7/7] Linux: Detect user namespace support in io/tst-getcwd-smallbuff
Date: Mon, 24 Jan 2022 23:48:57 +0100 [thread overview]
Message-ID: <20220124224857.3799610-7-aurelien@aurel32.net> (raw)
In-Reply-To: <20220124224857.3799610-1-aurelien@aurel32.net>
From: Florian Weimer <fweimer@redhat.com>
Otherwise the test fails with certain container runtimes.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
(cherry picked from commit 5b8e7980c5dabd9aaefeba4f0208baa8cf7653ee)
---
sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c b/sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c
index d460d6e766..55362f6060 100644
--- a/sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c
+++ b/sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c
@@ -34,6 +34,7 @@
#include <sys/un.h>
#include <support/check.h>
#include <support/temp_file.h>
+#include <support/test-driver.h>
#include <support/xsched.h>
#include <support/xunistd.h>
@@ -188,6 +189,23 @@ do_test (void)
xmkdir (MOUNT_NAME, S_IRWXU);
atexit (do_cleanup);
+ /* Check whether user namespaces are supported. */
+ {
+ pid_t pid = xfork ();
+ if (pid == 0)
+ {
+ if (unshare (CLONE_NEWUSER | CLONE_NEWNS) != 0)
+ _exit (EXIT_UNSUPPORTED);
+ else
+ _exit (0);
+ }
+ int status;
+ xwaitpid (pid, &status, 0);
+ TEST_VERIFY_EXIT (WIFEXITED (status));
+ if (WEXITSTATUS (status) != 0)
+ return WEXITSTATUS (status);
+ }
+
TEST_VERIFY_EXIT (socketpair (AF_UNIX, SOCK_STREAM, 0, sockfd) == 0);
pid_t child_pid = xclone (child_func, NULL, child_stack,
sizeof (child_stack),
--
2.34.1
prev parent reply other threads:[~2022-01-24 22:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 22:48 [COMMITTED 2.33 1/7] support: Add helpers to create paths longer than PATH_MAX Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 2/7] realpath: Set errno to ENAMETOOLONG for result larger than PATH_MAX [BZ #28770] Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 3/7] tst-realpath-toolong: Fix hurd build Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 4/7] support: Add xclone Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 5/7] getcwd: Set errno to ERANGE for size == 1 (CVE-2021-3999) Aurelien Jarno
2022-01-24 22:48 ` [COMMITTED 2.33 6/7] realpath: Avoid overwriting preexisting error (CVE-2021-3998) Aurelien Jarno
2022-01-24 22:48 ` Aurelien Jarno [this message]
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=20220124224857.3799610-7-aurelien@aurel32.net \
--to=aurelien@aurel32.net \
--cc=fweimer@redhat.com \
--cc=libc-stable@sourceware.org \
--cc=siddhesh@sourceware.org \
/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).