iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests/memfd: fix test_sysctl

Browse Source 
sysctl memfd_noexec is pid-namespaced, non-reservable, and inherent to the
child process.

Move the inherence test from init ns to child ns, so init ns can keep the
default value.

Link: https://lkml.kernel.org/r/20230414022801.2545257-1-jeffxu@google.com
Signed-off-by: Jeff Xu <jeffxu@google.com>
Reported-by: kernel test robot <yujie.liu@intel.com>
  Link: https://lore.kernel.org/oe-lkp/202303312259.441e35db-yujie.liu@intel.com
Tested-by: Yujie Liu <yujie.liu@intel.com>
Cc: Daniel Verkamp <dverkamp@chromium.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Jorge Lucangeli Obes <jorgelo@chromium.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Jeff Xu
2023-04-14 02:28:01 +00:00
committed by Andrew Morton
parent c025da0f14
commit 3cc0c3738c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/testing/selftests/memfd/memfd_test.c
View File

@ -43,6 +43,9 @@
*/ */
static size_t mfd_def_size = MFD_DEF_SIZE; static size_t mfd_def_size = MFD_DEF_SIZE;
static const char *memfd_str = MEMFD_STR; static const char *memfd_str = MEMFD_STR;
static pid_t spawn_newpid_thread(unsigned int flags, int (*fn)(void *));
static int newpid_thread_fn2(void *arg);
static void join_newpid_thread(pid_t pid);
static ssize_t fd2name(int fd, char *buf, size_t bufsize) static ssize_t fd2name(int fd, char *buf, size_t bufsize)
{ {
@ -1111,6 +1114,7 @@ static void test_noexec_seal(void)
static void test_sysctl_child(void) static void test_sysctl_child(void)
{ {
int fd; int fd;
int pid;
printf("%s sysctl 0\n", memfd_str); printf("%s sysctl 0\n", memfd_str);
sysctl_assert_write("0"); sysctl_assert_write("0");
@ -1129,6 +1133,10 @@ static void test_sysctl_child(void)
mfd_def_size, mfd_def_size,
MFD_CLOEXEC | MFD_ALLOW_SEALING); MFD_CLOEXEC | MFD_ALLOW_SEALING);
printf("%s child ns\n", memfd_str);
pid = spawn_newpid_thread(CLONE_NEWPID, newpid_thread_fn2);
join_newpid_thread(pid);
mfd_assert_mode(fd, 0666); mfd_assert_mode(fd, 0666);
mfd_assert_has_seals(fd, F_SEAL_EXEC); mfd_assert_has_seals(fd, F_SEAL_EXEC);
mfd_fail_chmod(fd, 0777); mfd_fail_chmod(fd, 0777);
@ -1206,12 +1214,6 @@ static void test_sysctl(void)
int pid = spawn_newpid_thread(CLONE_NEWPID, newpid_thread_fn); int pid = spawn_newpid_thread(CLONE_NEWPID, newpid_thread_fn);
join_newpid_thread(pid); join_newpid_thread(pid);
printf("%s child ns\n", memfd_str);
sysctl_assert_write("1");
pid = spawn_newpid_thread(CLONE_NEWPID, newpid_thread_fn2);
join_newpid_thread(pid);
} }
/* /*