selftests-memfd-fix-test_sysctl.patch removed from -mm tree
The quilt patch titled
Subject: selftests/memfd: fix test_sysctl
has been removed from the -mm tree. Its filename was
selftests-memfd-fix-test_sysctl.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Jeff Xu <[email protected]>
Subject: selftests/memfd: fix test_sysctl
Date: Fri, 14 Apr 2023 02:28:01 +0000
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.
Signed-off-by Jeff Xu <[email protected]>
Reported-by kernel test robot <[email protected]>
Tested-by Yujie Liu <[email protected]>
Cc Daniel Verkamp <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Jann Horn <[email protected]>
Cc Jorge Lucangeli Obes <[email protected]>
Cc Kees Cook <[email protected]>
Cc Shuah Khan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
tools/testing/selftests/memfd/memfd_test.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
tools/testing/selftests/memfd/memfd_test.c renamed from tools/testing/selftests/memfd/memfd_test.c~selftests-memfd-fix-test_sysctl +8 -6
@@ -43,6 +43,9 @@*/ static size_t mfd_def_size =MFD_DEF_SIZE ;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) {
@@ -1111,6 +1114,7 @@ static void test_noexec_seal(void)static void test_sysctl_child (void ) {int fd; +int pid;printf ("%s sysctl 0\n" , memfd_str);sysctl_assert_write ("0" );
@@ -1129,6 +1133,10 @@ static void test_sysctl_child(void) mfd_def_size, 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_has_seals (fd,F_SEAL_EXEC );mfd_fail_chmod (fd,0777 );
@@ -1206,12 +1214,6 @@ static void test_sysctl(void)int pid =spawn_newpid_thread (CLONE_NEWPID , newpid_thread_fn);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); }/*
_
Patches currently in -mm which might be from [email protected] are