summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-01-24 18:14:24 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2022-01-25 12:15:36 +0100
commit8cce7727ac3250f1d83454f74cdd983de9bdc1ce (patch)
tree99e90f57cc19ddeddf9910467c3f1463671eebe4
parentrealpath: Avoid overwriting preexisting error (CVE-2021-3998) (diff)
downloadglibc-gentoo/glibc-2.33-7.tar.gz
glibc-gentoo/glibc-2.33-7.tar.bz2
glibc-gentoo/glibc-2.33-7.zip
Linux: Detect user namespace support in io/tst-getcwd-smallbuffgentoo/glibc-2.33-7
Otherwise the test fails with certain container runtimes. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> (cherry picked from commit 5b8e7980c5dabd9aaefeba4f0208baa8cf7653ee) (cherry picked from commit 48d9161e026604bfb1b186627d5b87c6e829a888)
-rw-r--r--sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c18
1 files changed, 18 insertions, 0 deletions
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),