db9712052c
* Mon Jan 24 2022 Florian Weimer <fweimer@redhat.com> - 2.34-21 - Sync with upstream branch release/2.34/master, commit 3438bbca90895d32825a52e31a77dc44d273c1c1: - Linux: Detect user namespace support in io/tst-getcwd-smallbuff - realpath: Avoid overwriting preexisting error - CVE-2021-3999: getcwd: Set errno to ERANGE for size == 1 - tst-realpath-toolong: Fix hurd build - CVE-2021-3998: realpath: ENAMETOOLONG for result larger than PATH_MAX - stdlib: Fix formatting of tests list in Makefile - stdlib: Sort tests in Makefile - support: Add helpers to create paths longer than PATH_MAX - powerpc: Fix unrecognized instruction errors with recent binutils - x86: use default cache size if it cannot be determined [BZ #28784] - CVE-2022-23218: Buffer overflow in sunrpc svcunix_create (bug 28768) - sunrpc: Test case for clnt_create "unix" buffer overflow (bug 22542) - CVE-2022-23219: Buffer overflow in sunrpc clnt_create for "unix" (bug 22542) - socket: Add the __sockaddr_un_set function - Disable debuginfod in printer tests [BZ #28757] - Update syscall lists for Linux 5.16 Resolves: #2032279 Resolves: #2032276
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
commit 3438bbca90895d32825a52e31a77dc44d273c1c1
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon Jan 24 18:14:24 2022 +0100
|
|
|
|
Linux: Detect user namespace support in io/tst-getcwd-smallbuff
|
|
|
|
Otherwise the test fails with certain container runtimes.
|
|
|
|
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
(cherry picked from commit 5b8e7980c5dabd9aaefeba4f0208baa8cf7653ee)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c b/sysdeps/unix/sysv/linux/tst-getcwd-smallbuff.c
|
|
index d460d6e7662dc5e4..55362f6060a2b3be 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),
|