From nobody Sat Oct 4 22:35:36 2025 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 493F81684B4; Tue, 12 Aug 2025 12:30:24 +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=1755001825; cv=none; b=TU9TJCej/kfSUe7K1p43TZqjLz7ESaMiQnlbBTbH2Utn5iegLVwrzrbK+tQMoRbQBOr60+Ce6l729cu8XFdvyu4GI9/yHYQhiMzG8xKBD2KmcAli4iAnr9te04/ATbOxEv5zfKVc3sYU2JtbBgAbLrNAyERPQyYCLdiXyzLMhP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755001825; c=relaxed/simple; bh=4LCta4AcPLkHFIbPLGXR+o9N2HzgQeovSeXRL839j+k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EHkqH5wr/s5WRXx2SzNk87GEx2MMc0r6dxvaF7OTUlfBRXcMO0MRrgO1FRXt083ujMLjiiDd7NoogFnTiXSIi/+5oEvPZc3KIOm7In7Z9KJGoVgjVTOwLJXF7DiXMgCK91qle+oDqpQ8GhXPNleH9VARg3UMFc2YgAFtoAsbsos= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a7FMKKpq; 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="a7FMKKpq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40083C4CEF4; Tue, 12 Aug 2025 12:30:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755001824; bh=4LCta4AcPLkHFIbPLGXR+o9N2HzgQeovSeXRL839j+k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=a7FMKKpqUtPufZZbAmKDdgwGLQBcbHSTQVZWOJmDc+gc1EIcPmINUvVaMD0VqefJ+ kF4KjU5OIMTUFmEy426WSzfIJ1EtV6hoBMxJkR655CKK/LZZIQRHTzVgPFzZqna1H/ miy9PonvgIAsUBLfLT/eg782qqlpE0bNN/azWK5GLpkweA+BcV5lC2KIupBJpqY0io DZhrZArVASsk77FDi3imPhyOSZM7YuJB/70+km7k6rO87MJc9NCxw/B5JMSUOSwcQ9 gfOCJFMmPC7ZHleIgeK/snVstbsUGQ/w55UlpKZIty6Y+fiZ6MFjPk7exnDxrH2Qgg h6M50P0NxILBw== From: Mark Brown Date: Tue, 12 Aug 2025 13:00:49 +0100 Subject: [PATCH v2 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: <20250812-selftests-fchmodat2-v2-1-f2d5380e94c3@kernel.org> References: <20250812-selftests-fchmodat2-v2-0-f2d5380e94c3@kernel.org> In-Reply-To: <20250812-selftests-fchmodat2-v2-0-f2d5380e94c3@kernel.org> To: Shuah Khan , Alexey Gladkov , Christian Brauner Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-cff91 X-Developer-Signature: v=1; a=openpgp-sha256; l=7319; i=broonie@kernel.org; h=from:subject:message-id; bh=4LCta4AcPLkHFIbPLGXR+o9N2HzgQeovSeXRL839j+k=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBomzPaV7fUUFZlbFhX1/MDijNZKEzW+5YEenZ5+ s8TA6RIKOCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaJsz2gAKCRAk1otyXVSH 0IJ6B/9v7r+WkyCnjmTzLhlpXMnS/93eTue/8dvDeAaTQZ4DYGPzvE4r6mjKH8Ix7mBN2vNDhvk pFP22lF1aqEwvQ9bD7u3CFE3CfhZWIQRDik9LO02JOWVErCtFpA4E0fD3Qy8QLuBjiR46MQSalK cJCND1xITaWSd7FMALr20/Z03SOgaRGDeZj6ueVSxaBUyORZ191KaaJY54711rJ8H7DIn+jqXHG 8SZGUa+KGGQWlUEN5jODSa1zDuMN6Rb+iqCOSZIdiPel6TGTNGmaom7r6oSsl4e1TTVLrrITz8r fngcyBhfuOIh7v/DCrNl9exUOyZatUXcwCyu0vD+TG9mrJDd 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. 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 e0319417124d..e977d942c00b 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.39.5 From nobody Sat Oct 4 22:35:36 2025 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 3E0AC1A5B9E; Tue, 12 Aug 2025 12:30:27 +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=1755001827; cv=none; b=oUC01uDCI63b5SCJ69sBvqBjc212HNrq5rFnGO0Vo5akH7BkbrcpcV1F+RrOmFw4Iip5oFdhsSiZDBIzmrQi1pzlGuc7TmUO7rr6XCcqjp0lIaLlGvrFICNIjsWG3ugNPlqbNZl8c8fgPiPTfqZTMOo+MQLOAbfLINZgcm/buKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755001827; c=relaxed/simple; bh=4YMzC/UP5j9ONXIT+pgGQsuo5xL6W9saqp3GH+DFxd8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kZxZJWXPdc/JdLvR2XY3yWtjbm2dIeVmPd0+aEnY0tYTOJEFXNeG005kaFw1fydR2J7PQVKL3VnnXaGEbsDuwWTrpx9ijgFeKWjPJUBptfY8h+t8gB+TNFLLIqfM/Uw2p3ZPjdJsBCtPfQmL701Sjm5VGGOn/owiCa0oiZU/YDE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CUYFjs+D; 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="CUYFjs+D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 867D6C4CEF4; Tue, 12 Aug 2025 12:30:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755001827; bh=4YMzC/UP5j9ONXIT+pgGQsuo5xL6W9saqp3GH+DFxd8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CUYFjs+D6E3+Yni0iSLEB84+ZuTPl/vsb6N5TfKmrRbGzCSvskVjl+VQICNhiDHTJ urf+cD4LAeaCNrFC/nX3yYnP3Mt/AbSnmk8/dW7Sb+wPkDPA+n/NrlGX60YX/42Z7u 0KDazsFHXRwRyduWV2R+ayJf3Pzk+VCqfxRM/bfunCJQDITawoY1GbHCuFgb06EeJV Yud+VVLr/jO7q9RqGczSuq/4x9UrShk+3Z+WoE2quXZe2uEeqca3vdPH7jLByzMylA BWcRksDHPbJ03qpzbQnQKySnb3BOHsO3iKK98upWulMpIk7LyKXUPzQ1Q1k4wSBJDj yD4MXEFd/lO4A== From: Mark Brown Date: Tue, 12 Aug 2025 13:00:50 +0100 Subject: [PATCH v2 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: <20250812-selftests-fchmodat2-v2-2-f2d5380e94c3@kernel.org> References: <20250812-selftests-fchmodat2-v2-0-f2d5380e94c3@kernel.org> In-Reply-To: <20250812-selftests-fchmodat2-v2-0-f2d5380e94c3@kernel.org> To: Shuah Khan , Alexey Gladkov , Christian Brauner Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-cff91 X-Developer-Signature: v=1; a=openpgp-sha256; l=780; i=broonie@kernel.org; h=from:subject:message-id; bh=4YMzC/UP5j9ONXIT+pgGQsuo5xL6W9saqp3GH+DFxd8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBomzPbFkSX+R3HJelxpxC55p4KmMS6+nEBfEoKG L6NwRhzKJiJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCaJsz2wAKCRAk1otyXVSH 0CZbB/9yVcGHj7af+sjVBNkKq+XYGrfxxze2GW2gqTwztgXqb/eNY9qnCybVTdmx2Oy5S81R1dv MfeC5vUGNERW8vMaSZjO7S0Q1QdskkIvPGxLcivn7zGe4rasOOa5Dvdp1XQZrUg5VlYzLNamEAN dwxPLj043vplcxlGHS4SOGeEjtDx5q75u/BGa1Hfmn/5aaNk+mL6IcYrkP3/xxyz3rR3AP44Z6Q 6JqPqKJo6gMseIyDAB4S5RKVBm9vKiQB84baXuoTmaVSsjTdiFI6CTwNfsH3VOKJ82RB5ImGopl /I7cNyMntunA4m1Oe9OrN5uqHltRwMiXu3p0A8eqyazBn8qA 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. 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 e977d942c00b..d3682ccd7cb8 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.39.5