Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795060010; b=ERsJit10FoPdMe7YbjiGTGWJSrKEBV+HIjpbozOKnYW+JVe6QTGmLJsPddIk37zQFaim 5ta45OUKd22ZCJ6D3aUFRdXCEKnrAI2HNPIDaSzoKY8aWyAQkvFo9HBcHuR2FMuGK6GQo 9z3IkkpNBazg6W6RiqsUp2QKY4/UNeBxczUpVeBrhTA0VZCqtc8yRH5fT5vOdSpeDzvmx DUlddWk885EIYozhI6PW+l35LKRBPaFE9FgS0t5z6ORS/8qq2ncjYf5vnb6ErlwkUvRBd gDpHMdPP4ABONSLPLo/YkecKhk24vZBvU0PuFIZoIchbRF7jscz0BpWhxkE2wZdDiQg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060010; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Rpq1BFbDrhFTPPlq0Mr/HhjmExU8rkgxQx/8+2a2kLU=; b=0RqXDGulz8mlBjsFz81QIxndi7ffi7/Oo0aNYkQS0sv5xxDfQP0df2GA++AWo7JQwQA5 2LIW1PsuNrfCmU7jsoz/RVll2VtDL4a1eqQKr6G9j5wJTJ8tV/0BYXN4mWl2gartQR0QR wQI/upZBU3F3cwHPIqkMgGdm+Ayv+lSs4/f/MMYqxENGSOTfji7mB78pADE1p37POg42f 1iVNFHM5udUEEAFARmcUlkVr4xlebOeE+7PYtPNsslbfXUwn+BorfxkTksZ3JQopPEru0 Y5jJeLyPDnOfxaNQXmo9C960ICEskIJFQ0xIsTBQ/C1WhOdN2f4Q/YQ03R0BhxiTlzA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wO+2P3Mt; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2DD0606A320; Thu, 19 Nov 2026 03:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=wO+2P3Mt Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C10B1F000C4; Thu, 19 Nov 2026 03:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060010; bh=Rpq1BFbDrhFTPPlq0Mr/HhjmExU8rkgxQx/8+2a2kLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wO+2P3Mtk9kCXwW8rE8sGireAAdZUuIJ/WYDsdh5oo8pnI8NxHTHIOfI6FSSt4Jj3 xv0YwmuE7CaTYMAwtPbK4XiLs4PYHktiZKsZbeHUPEbrt0vHBUdDoTpkr84fq5Tl0k on2jKBUBe7+rtFH8jiDzioxSx/NmqhqknlyNM7aY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Konstantin Khorenko , Eva Kurchatova , Andrew Morton , Shuah Khan , Wei Yang , Sasha Levin Subject: [PATCH 5.10 1046/1848] selftests/core: fix unshare_test with large fs.nr_open Date: Wed, 18 Nov 2026 15:51:24 +0100 Message-ID: <20261118150001.105377872@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Konstantin Khorenko [ Upstream commit df0b7e0ea59c43708cff8c7e34da5e2f8d430e5e ] The test assumes fs.nr_open is close to the default 1048576, but some systems set it much higher (e.g. 1073741816). This is systemd's doing: since systemd v240 (2018), PID 1 bumps fs.nr_open and fs.file-max to their largest possible values on boot, as file descriptors are already accounted for by memcg [1]. In that case, dup2() to nr_open + 64 requires the kernel to allocate a file descriptor table with ~1 billion entries, which fails with ENOMEM. On a kernel that already carries 04a2c4b4511d1, dup2() no longer fails with ENOMEM. The allocation is now rejected up front and the caller gets EMFILE instead, without the WARNING, but the test still fails. Cap the nr_open value used for the test's own arithmetic to a known reasonable base value (1048576) and restore the true original value once the test has completed. Link: https://lore.kernel.org/20260814165709.513263-1-khorenko@virtuozzo.com Link: https://github.com/systemd/systemd/commit/a8b627aaed409a15260c25988970c795bf963812 [1] Signed-off-by: Konstantin Khorenko Signed-off-by: Eva Kurchatova Signed-off-by: Andrew Morton Cc: Shuah Khan Cc: Wei Yang Cc: Signed-off-by: Sasha Levin --- tools/testing/selftests/core/unshare_test.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/core/unshare_test.c b/tools/testing/selftests/core/unshare_test.c index 7fec9dfb1b0e3..6716e0f74d7da 100644 --- a/tools/testing/selftests/core/unshare_test.c +++ b/tools/testing/selftests/core/unshare_test.c @@ -40,6 +40,14 @@ TEST(unshare_EMFILE) ASSERT_EQ(sscanf(buf, "%d", &nr_open), 1); + /* + * Cap nr_open for the duration of the test to avoid ENOMEM from a + * huge fd table allocation; buf/n keep the real original value so + * fs.nr_open can be restored to it once the test is done. + */ + if (nr_open > 1024 * 1024) + nr_open = 1024 * 1024; + ASSERT_EQ(0, getrlimit(RLIMIT_NOFILE, &rlimit)); /* bump fs.nr_open */ @@ -73,10 +81,13 @@ TEST(unshare_EMFILE) if (pid == 0) { int err; + char buf3[32]; + ssize_t n3; - /* restore fs.nr_open */ + /* restore fs.nr_open to the (possibly capped) test baseline */ + n3 = sprintf(buf3, "%d\n", nr_open); lseek(fd, 0, SEEK_SET); - write(fd, buf, n); + write(fd, buf3, n3); /* ... and now unshare(CLONE_FILES) must fail with EMFILE */ err = unshare(CLONE_FILES); EXPECT_EQ(err, -1) @@ -89,6 +100,10 @@ TEST(unshare_EMFILE) EXPECT_EQ(waitpid(pid, &status, 0), pid); EXPECT_EQ(true, WIFEXITED(status)); EXPECT_EQ(0, WEXITSTATUS(status)); + + /* restore the real fs.nr_open value */ + lseek(fd, 0, SEEK_SET); + write(fd, buf, n); } TEST_HARNESS_MAIN -- 2.53.0