1From 78e46e5fc2c79b99b42224398eaac3852048bcd1 Mon Sep 17 00:00:00 2001 2From: Edward Liaw <[email protected]> 3Date: Thu, 28 Apr 2022 20:17:56 +0000 4Subject: [PATCH 15/20] binderfs: skip when user namespace unavailable 5 6Skips the unprivileged test as this depends on CONFIG_USER_NS which 7we don't set for Android platforms. 8 9Signed-off-by: Edward Liaw <[email protected]> 10--- 11 .../selftests/filesystems/binderfs/binderfs_test.c | 10 ++++++++++ 12 1 file changed, 10 insertions(+) 13 14diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c 15index 5f362c0fd890..047b228fcb91 100644 16--- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c 17+++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c 18@@ -291,6 +291,11 @@ static int write_id_mapping(enum idmap_type type, pid_t pid, const char *buf, 19 return 0; 20 } 21 22+static bool has_userns() 23+{ 24+ return (access("/proc/self/ns/user", F_OK) == 0); 25+} 26+ 27 static void change_userns(struct __test_metadata *_metadata, int syncfds[2]) 28 { 29 int ret; 30@@ -378,6 +383,9 @@ static void *binder_version_thread(void *data) 31 */ 32 TEST(binderfs_stress) 33 { 34+ if (!has_userns()) 35+ SKIP(return, "%s: user namespace not supported\n", __func__); 36+ 37 int fds[1000]; 38 int syncfds[2]; 39 pid_t pid; 40@@ -502,6 +510,8 @@ TEST(binderfs_test_privileged) 41 42 TEST(binderfs_test_unprivileged) 43 { 44+ if (!has_userns()) 45+ SKIP(return, "%s: user namespace not supported\n", __func__); 46 int ret; 47 int syncfds[2]; 48 pid_t pid; 49-- 502.42.0.609.gbb76f46606-goog 51 52