From nobody Sat Apr 4 11:37:42 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71E7A3A7849; Thu, 26 Feb 2026 22:24:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772144691; cv=none; b=abLBor7PIi3qKmxVdQ82MS7JJ4fJ4UhhSISjcl0XVJ/5lJ4W+u1k1t2WxvzsemvDINxq2AJ2tCBO6mXO9EWO63JRRP89TiBVbXWYBB7QL10wLArtJKzqE+Zty38Ney5fAIuDMjdDBQT4uiPZZ46EVebkvQVE3hUYwrX+AYNiyjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772144691; c=relaxed/simple; bh=gfRRiSljGFcFHhZCp8h6uudeERPWEjZsb7vMNz+pmeo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WNoAKycwSXKw0DH7HeO5Z4rkJlHErsXtrDA5xFdSdOXMGB78mzNvpG683wxJhGrV3gg5kH6X1dDQSzu2wSbeBzm9u+8/HyX5gdMBkzFpwTwzoaex2tliWC8Bjgz9wJmmD7Chcsf4OkgoWUAHDpl4HxrlJdCHXKHezCoQKh1ljHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tqoSjeM1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tqoSjeM1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD45DC116C6; Thu, 26 Feb 2026 22:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772144691; bh=gfRRiSljGFcFHhZCp8h6uudeERPWEjZsb7vMNz+pmeo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tqoSjeM1Jz6lSGDEi8LjHYwE2R43jtQ5RoJRxea2iLc+3WvEg/kEsxtESQKIW0Mw7 CW/8Hqb4jQhZv0oNR4TWEoblaKcyiOFt5xNCDZeJltDDsuA4bunKLa6sZ60RXBjJSc w3jC1rrvo5h0d68PpfQqoWtdAPouqIQkSS5iOklyPBtjRUuXl8yPr09Ed7k48Qf9Dk R65CqUp1FVOdM5QydEs6z/z3mtZXLGMv7mVKHOInhY/SxkS7l9RTbdETI+fkoP83Ro AhdckCMYAOzSGY06Q66c1QtW6uO4TWX03XWSvFaE3gltwpps58vaIr2RyFu1Jmlso0 ObaDiRzzYnEVw== From: Mark Brown Date: Thu, 26 Feb 2026 22:24:42 +0000 Subject: [PATCH v4 1/2] selftests/fchmodat2: Clean up temporary files and directories Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260226-selftests-fchmodat2-v4-1-a6419435f2e8@kernel.org> References: <20260226-selftests-fchmodat2-v4-0-a6419435f2e8@kernel.org> In-Reply-To: <20260226-selftests-fchmodat2-v4-0-a6419435f2e8@kernel.org> To: Shuah Khan , Alexey Gladkov , Christian Brauner Cc: Andrew Morton , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=7362; i=broonie@kernel.org; h=from:subject:message-id; bh=gfRRiSljGFcFHhZCp8h6uudeERPWEjZsb7vMNz+pmeo=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBpoMgu4IfxzYYBmB54XeY4Ar0XZhHlUJzc4/MvJ geHRjOw4/qJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaaDILgAKCRAk1otyXVSH 0KiSB/9gywoFCXhegwHek0mkiuABbBnpi1Vq4cbirla4R8CH11ptF8kDDzKVUJFZm9OeSr+4QMi baZnZbnvb+Dn7wkbIJRtqep2Dh52VW3dJ9VU5Nc0/0QwabrENSlgasXz7KzbEym43BJdX8rSuNf 3R8JrLo0LeKd0QsK6T08+NERpT96+Mj3PhHo4b1wHBoBmEXhhWyx5goST5w+W6AwxoTBnCS24sA tPz8ZwY5H0VCuBykMH/OJm7+X4jNlljSkFfx9fkq3wJ5yXZM18ypbgfaNvVCBSAUtp/2auxDGdp DddPtwfdMB26HgyZy7WYdXsfCBo0/rE1UL0fGCba8kkyBcgN X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB The fchmodat2() test program creates a temporary directory with a file and a symlink for every test it runs but never cleans these up, resulting in ${TMPDIR} getting left with stale files after every run. Restructure the program a bit to ensure that we clean these up, this is more invasive than it might otherwise be due to the extensive use of ksft_exit_fail_msg() in the program. As a side effect this also ensures that we report a consistent test name for the tests and always try both tests even if they are skipped. Acked-by: Alexey Gladkov Signed-off-by: Mark Brown --- tools/testing/selftests/fchmodat2/fchmodat2_test.c | 161 ++++++++++++++---= ---- 1 file changed, 111 insertions(+), 50 deletions(-) diff --git a/tools/testing/selftests/fchmodat2/fchmodat2_test.c b/tools/tes= ting/selftests/fchmodat2/fchmodat2_test.c index e397339495f6..e03430c4675c 100644 --- a/tools/testing/selftests/fchmodat2/fchmodat2_test.c +++ b/tools/testing/selftests/fchmodat2/fchmodat2_test.c @@ -9,6 +9,11 @@ =20 #include "kselftest.h" =20 +struct testdir { + char *dirname; + int dfd; +}; + int sys_fchmodat2(int dfd, const char *filename, mode_t mode, int flags) { int ret =3D syscall(__NR_fchmodat2, dfd, filename, mode, flags); @@ -16,9 +21,9 @@ int sys_fchmodat2(int dfd, const char *filename, mode_t m= ode, int flags) return ret >=3D 0 ? ret : -errno; } =20 -int setup_testdir(void) +static void setup_testdir(struct testdir *testdir) { - int dfd, ret; + int ret, dfd; char dirname[] =3D "/tmp/ksft-fchmodat2.XXXXXX"; =20 /* Make the top-level directory. */ @@ -26,21 +31,48 @@ int setup_testdir(void) ksft_exit_fail_msg("%s: failed to create tmpdir\n", __func__); =20 dfd =3D open(dirname, O_PATH | O_DIRECTORY); - if (dfd < 0) - ksft_exit_fail_msg("%s: failed to open tmpdir\n", __func__); + if (dfd < 0) { + ksft_perror("failed to open tmpdir"); + goto err; + } =20 ret =3D openat(dfd, "regfile", O_CREAT | O_WRONLY | O_TRUNC, 0644); - if (ret < 0) - ksft_exit_fail_msg("%s: failed to create file in tmpdir\n", - __func__); + if (ret < 0) { + ksft_perror("failed to create file in tmpdir"); + goto err; + } close(ret); =20 ret =3D symlinkat("regfile", dfd, "symlink"); - if (ret < 0) - ksft_exit_fail_msg("%s: failed to create symlink in tmpdir\n", - __func__); + if (ret < 0) { + ksft_perror("symlinkat() failed"); + goto err_regfile; + } + + testdir->dirname =3D strdup(dirname); + if (!testdir->dirname) { + ksft_perror("Out of memory"); + goto err_symlink; + } + testdir->dfd =3D dfd; + + return; + +err_symlink: + unlinkat(testdir->dfd, "symlink", 0); +err_regfile: + unlinkat(testdir->dfd, "regfile", 0); +err: + unlink(dirname); + ksft_exit_fail(); +} =20 - return dfd; +static void cleanup_testdir(struct testdir *testdir) +{ + unlinkat(testdir->dfd, "regfile", 0); + unlinkat(testdir->dfd, "symlink", 0); + rmdir(testdir->dirname); + free(testdir->dirname); } =20 int expect_mode(int dfd, const char *filename, mode_t expect_mode) @@ -48,61 +80,80 @@ int expect_mode(int dfd, const char *filename, mode_t e= xpect_mode) struct stat st; int ret =3D fstatat(dfd, filename, &st, AT_SYMLINK_NOFOLLOW); =20 - if (ret) - ksft_exit_fail_msg("%s: %s: fstatat failed\n", - __func__, filename); + if (ret) { + ksft_perror("fstatat() failed\n"); + return 0; + } =20 return (st.st_mode =3D=3D expect_mode); } =20 void test_regfile(void) { - int dfd, ret; - - dfd =3D setup_testdir(); + struct testdir testdir; + int ret; =20 - ret =3D sys_fchmodat2(dfd, "regfile", 0640, 0); + setup_testdir(&testdir); =20 - if (ret < 0) - ksft_exit_fail_msg("%s: fchmodat2(noflag) failed\n", __func__); - - if (!expect_mode(dfd, "regfile", 0100640)) - ksft_exit_fail_msg("%s: wrong file mode bits after fchmodat2\n", - __func__); + ret =3D sys_fchmodat2(testdir.dfd, "regfile", 0640, 0); =20 - ret =3D sys_fchmodat2(dfd, "regfile", 0600, AT_SYMLINK_NOFOLLOW); + if (ret < 0) { + ksft_perror("fchmodat2(noflag) failed"); + goto out; + } =20 - if (ret < 0) - ksft_exit_fail_msg("%s: fchmodat2(AT_SYMLINK_NOFOLLOW) failed\n", + if (!expect_mode(testdir.dfd, "regfile", 0100640)) { + ksft_print_msg("%s: wrong file mode bits after fchmodat2\n", __func__); - - if (!expect_mode(dfd, "regfile", 0100600)) - ksft_exit_fail_msg("%s: wrong file mode bits after fchmodat2 with nofoll= ow\n", - __func__); - - ksft_test_result_pass("fchmodat2(regfile)\n"); + ret =3D 1; + goto out; + } + + ret =3D sys_fchmodat2(testdir.dfd, "regfile", 0600, AT_SYMLINK_NOFOLLOW); + + if (ret < 0) { + ksft_perror("fchmodat2(AT_SYMLINK_NOFOLLOW) failed"); + goto out; + } + + if (!expect_mode(testdir.dfd, "regfile", 0100600)) { + ksft_print_msg("%s: wrong file mode bits after fchmodat2 with nofollow\n= ", + __func__); + ret =3D 1; + } + +out: + ksft_test_result(ret =3D=3D 0, "fchmodat2(regfile)\n"); + cleanup_testdir(&testdir); } =20 void test_symlink(void) { - int dfd, ret; + struct testdir testdir; + int ret; =20 - dfd =3D setup_testdir(); + setup_testdir(&testdir); =20 - ret =3D sys_fchmodat2(dfd, "symlink", 0640, 0); + ret =3D sys_fchmodat2(testdir.dfd, "symlink", 0640, 0); =20 - if (ret < 0) - ksft_exit_fail_msg("%s: fchmodat2(noflag) failed\n", __func__); + if (ret < 0) { + ksft_perror("fchmodat2(noflag) failed"); + goto err; + } =20 - if (!expect_mode(dfd, "regfile", 0100640)) - ksft_exit_fail_msg("%s: wrong file mode bits after fchmodat2\n", - __func__); + if (!expect_mode(testdir.dfd, "regfile", 0100640)) { + ksft_print_msg("%s: wrong file mode bits after fchmodat2\n", + __func__); + goto err; + } =20 - if (!expect_mode(dfd, "symlink", 0120777)) - ksft_exit_fail_msg("%s: wrong symlink mode bits after fchmodat2\n", - __func__); + if (!expect_mode(testdir.dfd, "symlink", 0120777)) { + ksft_print_msg("%s: wrong symlink mode bits after fchmodat2\n", + __func__); + goto err; + } =20 - ret =3D sys_fchmodat2(dfd, "symlink", 0600, AT_SYMLINK_NOFOLLOW); + ret =3D sys_fchmodat2(testdir.dfd, "symlink", 0600, AT_SYMLINK_NOFOLLOW); =20 /* * On certain filesystems (xfs or btrfs), chmod operation fails. So we @@ -111,18 +162,28 @@ void test_symlink(void) * * https://sourceware.org/legacy-ml/libc-alpha/2020-02/msg00467.html */ - if (ret =3D=3D 0 && !expect_mode(dfd, "symlink", 0120600)) - ksft_exit_fail_msg("%s: wrong symlink mode bits after fchmodat2 with nof= ollow\n", + if (ret =3D=3D 0 && !expect_mode(testdir.dfd, "symlink", 0120600)) { + ksft_print_msg("%s: wrong symlink mode bits after fchmodat2 with nofollo= w\n", __func__); + ret =3D 1; + goto err; + } =20 - if (!expect_mode(dfd, "regfile", 0100640)) - ksft_exit_fail_msg("%s: wrong file mode bits after fchmodat2 with nofoll= ow\n", - __func__); + if (!expect_mode(testdir.dfd, "regfile", 0100640)) { + ksft_print_msg("%s: wrong file mode bits after fchmodat2 with nofollow\n= ", + __func__); + } =20 if (ret !=3D 0) ksft_test_result_skip("fchmodat2(symlink)\n"); else ksft_test_result_pass("fchmodat2(symlink)\n"); + cleanup_testdir(&testdir); + return; + +err: + ksft_test_result_fail("fchmodat2(symlink)\n"); + cleanup_testdir(&testdir); } =20 #define NUM_TESTS 2 --=20 2.47.3 From nobody Sat Apr 4 11:37:42 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 008F4396B82; Thu, 26 Feb 2026 22:24:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772144693; cv=none; b=Hz4f1Bzvf2WSltnRX/YC04rBZg1iOGUwpUuw0FSwZyHvBvuEl06JccNJRlmc+RtNlJENyer9m/i+JEVbgE/7sA2LfAiwZfHSrUjyhp/xGVm9WL14rnNUNFnAPxMY5lUwHpHNn9OqSysfDayevoIlcBkA+1POxQSNxIfVN3tBJpw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772144693; c=relaxed/simple; bh=Ed5ZeeMeyy/vi/c75SL51tBox+lgE4FzfZW5alEE0rM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j8GtOguCkiFwSJkPz6cPnCfVYP0ILiQAbVtKM8z67/8tWCCa4/OaOHKkGSFDJgiTPFG/erLPgVA+B4rzllRC8cbVABGZa6Z+YC4zGWSUt7e/o8YUpFcSXx164XjYO10x/h/+UgaZ5/qfGnfml+hZI2bbsx/njpDBAoiF+vWL100= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hek8RmB1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hek8RmB1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72AC9C19422; Thu, 26 Feb 2026 22:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772144692; bh=Ed5ZeeMeyy/vi/c75SL51tBox+lgE4FzfZW5alEE0rM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hek8RmB1SnlhSv+QZfaPfou3Ro1FV7X513m+drgZ4FBv/KNaLT/BwspIT/QO3+Nh3 tOePmrzzOqYustF/MnbHM94CfumA2CjkN89RFDYRX+Mt+fuVBcJLzoxSKT4Jcw/LyB G+S4j7PyjZF2a8/WwlPt86nM5a/GDe/CE4RiTAyu+0pPr1835agTXn2OH/+nbRpf0j gke3ndaV3StLYPkYaaQPNTcTy6nY2MtzB446XkGMNJyyBtgtUsSfN+VCOCDWo1TcNO KcvBruVF70FjYqBUe6DSA/wWXUtdOEIjc/vU5wZIATI8/itZyYVz+wfScCeN2WT8iI DjJsmbH4Wh2Rw== From: Mark Brown Date: Thu, 26 Feb 2026 22:24:43 +0000 Subject: [PATCH v4 2/2] selftests/fchmodat2: Use ksft_finished() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260226-selftests-fchmodat2-v4-2-a6419435f2e8@kernel.org> References: <20260226-selftests-fchmodat2-v4-0-a6419435f2e8@kernel.org> In-Reply-To: <20260226-selftests-fchmodat2-v4-0-a6419435f2e8@kernel.org> To: Shuah Khan , Alexey Gladkov , Christian Brauner Cc: Andrew Morton , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=826; i=broonie@kernel.org; h=from:subject:message-id; bh=Ed5ZeeMeyy/vi/c75SL51tBox+lgE4FzfZW5alEE0rM=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBpoMgvRrb/oVJBzn8/20fV0mQVvsAibPK/RUYdG ZBdSACr/MaJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaaDILwAKCRAk1otyXVSH 0E6RB/9cXpHug8Pi+Lz1LvO0yVqnrk1K2Pbak8EXSBiHw4ukAA6vKfC2I5/U4bRWGdlrVMkwURO RC6G7Or0Z2WA1yMLGNz9gkcAl/0AwQ78Tsa3xkAm6OMBlESXeETR8F1zq4qlvEvaR2fszLmJO1p ogkvqdnp29SdfrUHwDvZIFXSynyIV0Ap6PkNCnklbmjj3WRi7UF48+HAgdV2fdvj9iMSkWIsZob 1dQrhK87GtbuBv3zv83aQkpqMDNUTWZyH/bg3Yg4oIStaclWFESZ+cs7CnFrczvAlXMRmqohrcM JzBK7Pdu62h9dh2RmS4S8plrYATD6pD/pPCmakqAStjUSEO7 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB The fchmodat2 test program open codes a version of ksft_finished(), use the standard version. Acked-by: Alexey Gladkov Signed-off-by: Mark Brown --- tools/testing/selftests/fchmodat2/fchmodat2_test.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/testing/selftests/fchmodat2/fchmodat2_test.c b/tools/tes= ting/selftests/fchmodat2/fchmodat2_test.c index e03430c4675c..8e1b6384b319 100644 --- a/tools/testing/selftests/fchmodat2/fchmodat2_test.c +++ b/tools/testing/selftests/fchmodat2/fchmodat2_test.c @@ -196,8 +196,5 @@ int main(int argc, char **argv) test_regfile(); test_symlink(); =20 - if (ksft_get_fail_cnt() + ksft_get_error_cnt() > 0) - ksft_exit_fail(); - else - ksft_exit_pass(); + ksft_finished(); } --=20 2.47.3