From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id 7BCAE3858D3C; Mon, 24 Jan 2022 22:49:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BCAE3858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Content-Type:From:Reply-To: Subject:Content-ID:Content-Description:X-Debbugs-Cc; bh=uWEgIer1xqJBTZKEQqbXWw/Pza9zfDdfiMJuHIzGKt0=; b=k+80GbLam5rjSMRvaS/iGzY0oK 0S/fhQ/pVS5BLkqdiRHlp4wJLP7OGEx1PEPnYbxSId9KizFXOi0cp+vo30hF+kcZJy5bnl2wcfNJ5 3yjQkaG5aDTPgbZq0x+jxqYvbSmyt4XQa2LWBJ7RsbU7b4oJN6wHHLcwMfpbKPOVClsHElpmWAnwy jYiem9vkTeEkaqK94NO1f8Zv4d3G+puaOLuVRRdSXhkHa+pKU9k/XEz1PaVcJPtpzVfM89n2jgh5k wgUOI40XReSwuFcU2aCRhInkG/BZK7pNuienIH529fBEstqC77R1D/eDAMwhD7xgES5HZvnAh9gX8 Y8QsTAaw==; Received: from [2a01:e34:ec5d:a741:8a4c:7c4e:dc4c:1787] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nC88y-00FSYN-15; Mon, 24 Jan 2022 23:49:00 +0100 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.95) (envelope-from ) id 1nC88x-00Fwja-9J; Mon, 24 Jan 2022 23:48:59 +0100 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Florian Weimer , Siddhesh Poyarekar 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 Message-Id: <20220124224857.3799610-7-aurelien@aurel32.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124224857.3799610-1-aurelien@aurel32.net> References: <20220124224857.3799610-1-aurelien@aurel32.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jan 2022 22:49:06 -0000 From: Florian Weimer Otherwise the test fails with certain container runtimes. Reviewed-by: Siddhesh Poyarekar (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 #include #include +#include #include #include @@ -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