Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Zhangjin Wu <falcon@tinylab.org>
To:     w@1wt.eu
Cc:     thomas@t-8ch.de, arnd@arndb.de, falcon@tinylab.org,
        linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: [PATCH v1 14/17] selftests/nolibc: rename chroot_exe to chroot_file
Date:   Wed, 21 Jun 2023 21:13:20 +0800
Message-Id: <217a4460a1f4e5fa6fd0312340ea7b7b32ac225f.1687344643.git.falcon@tinylab.org>
In-Reply-To: <cover.1687344643.git.falcon@tinylab.org>
References: <cover.1687344643.git.falcon@tinylab.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrsz:qybglogicsvrsz3a-3
Precedence: bulk

When there is no procfs, let's use tmpfs and create a tmp file for
chroot_exe test.

Since chroot_exe is mainly testing the not directory case (ENOTDIR), so,
rename it to chroot_file may be better.

Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
---
 tools/testing/selftests/nolibc/nolibc-test.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
index c900564219e8..19e4ef5ce578 100644
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -547,11 +547,14 @@ int run_syscall(int min, int max)
 	int has_proc;
 	int test;
 	int tmp;
+	int fd;
 	int ret = 0;
 	void *p1, *p2;
 	int has_gettid = 1;
 	int has_tmpdir = 0;
+	int has_tmpfile = 0;
 	char *tmpdir = NULL;
+	char *tmpfile = NULL;
 
 	/* <has_proc> indicates whether or not /proc is mounted */
 	has_proc = stat("/proc", &stat_buf) == 0;
@@ -560,10 +563,20 @@ int run_syscall(int min, int max)
 	if (stat("/proc/self/net", &stat_buf) == 0) {
 		tmpdir = "/proc/self/net";
 		has_tmpdir = 1;
+
+		tmpfile = "/proc/self/exe";
+		has_tmpfile = 1;
 	} else if (stat("/tmp/.", &stat_buf) == 0) {
 		tmpdir = "/tmp/blah";
 		if (mkdir(tmpdir, 0755) == 0)
 			has_tmpdir = 1;
+
+		tmpfile = "/tmp/dummy";
+		fd = open(tmpfile, O_CREAT);
+		if (fd != -1) {
+			has_tmpfile = 1;
+			close(fd);
+		}
 	}
 
 	/* this will be used to skip certain tests that can't be run unprivileged */
@@ -599,7 +612,7 @@ int run_syscall(int min, int max)
 		CASE_TEST(chown_self);        EXPECT_SYSER(has_proc, chown("/proc/self", 0, 0), -1, EPERM); break;
 		CASE_TEST(chroot_root);       EXPECT_SYSZR(is_root, chroot("/")); break;
 		CASE_TEST(chroot_blah);       EXPECT_SYSER(1, chroot("/proc/self/blah"), -1, ENOENT); break;
-		CASE_TEST(chroot_exe);        EXPECT_SYSER(has_proc, chroot("/proc/self/exe"), -1, ENOTDIR); break;
+		CASE_TEST(chroot_file);       EXPECT_SYSER(has_tmpfile, chroot(tmpfile), -1, ENOTDIR); break;
 		CASE_TEST(close_m1);          EXPECT_SYSER(1, close(-1), -1, EBADF); break;
 		CASE_TEST(close_dup);         EXPECT_SYSZR(1, close(dup(0))); break;
 		CASE_TEST(dup_0);             tmp = dup(0);  EXPECT_SYSNE(1, tmp, -1); close(tmp); break;
-- 
2.25.1