mm-memfd-sysctl-fix-memfd_noexec_scope_noexec_enforced.patch removed from -mm tree
The quilt patch titled
Subject: mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED
has been removed from the -mm tree. Its filename was
mm-memfd-sysctl-fix-memfd_noexec_scope_noexec_enforced.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: mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED
Date: Wed, 5 Jul 2023 06:33:14 +0000
Patch series "mm/memfd: fix sysctl MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED", v2.
When sysctl vm.memfd_noexec is 2 (MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED), memfd_create(.., MFD_EXEC) should fail.
This complies with how MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED is defined - "memfd_create() without MFD_NOEXEC_SEAL will be rejected"
Thanks to Dominique Martinet <[email protected]> who reported the bug. see [1] for context.
This patch (of 2):
When vm.memfd_noexec is 2 (MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED), memfd_create(.., MFD_EXEC) should fail.
This complies with how MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED is defined - "memfd_create() without MFD_NOEXEC_SEAL will be rejected"
---
mm/memfd.c | 57 +++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 24 deletions(-)
mm/memfd.c renamed from mm/memfd.c~mm-memfd-sysctl-fix-memfd_noexec_scope_noexec_enforced +33 -24
@@ -268,6 +268,36 @@ long memfd_fcntl(struct file *file, unsi#define MFD_ALL_FLAGS (MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_HUGETLB | MFD_NOEXEC_SEAL | MFD_EXEC) +static int check_sysctl_memfd_noexec (unsigned int *flags) +{ +#ifdef CONFIG_SYSCTL +char comm[TASK_COMM_LEN ]; +int sysctl =MEMFD_NOEXEC_SCOPE_EXEC ; +struct pid_namespace *ns; + + ns =task_active_pid_ns (current); +if (ns) + sysctl = ns->memfd_noexec_scope; + +if (!(*flags & (MFD_EXEC |MFD_NOEXEC_SEAL ))) { +if (sysctl ==MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL ) + *flags |=MFD_NOEXEC_SEAL ; +else + *flags |=MFD_EXEC ; + } + +if (*flags &MFD_EXEC && sysctl >=MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED ) { +pr_warn_once ( +"memfd_create(): MFD_NOEXEC_SEAL is enforced, pid=%d '%s'\n" , +task_pid_nr (current),get_task_comm (comm, current)); + +return -EACCES ; + } +#endif + +return 0 ; +} +SYSCALL_DEFINE2 (memfd_create, const char __user *, uname, unsigned int, flags)
@@ -294,35 +324,14 @@ SYSCALL_DEFINE2(memfd_create,return -EINVAL ;if (!(flags & (MFD_EXEC |MFD_NOEXEC_SEAL ))) { -#ifdef CONFIG_SYSCTL -int sysctl =MEMFD_NOEXEC_SCOPE_EXEC ; -struct pid_namespace *ns; - - ns =task_active_pid_ns (current); -if (ns) - sysctl = ns->memfd_noexec_scope; - -switch (sysctl) { -case MEMFD_NOEXEC_SCOPE_EXEC : - flags |=MFD_EXEC ; -break ; -case MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL : - flags |=MFD_NOEXEC_SEAL ; -break ; -default : -pr_warn_once ( -"memfd_create(): MFD_NOEXEC_SEAL is enforced, pid=%d '%s'\n" , -task_pid_nr (current),get_task_comm (comm, current)); -return -EINVAL ; - } -#else - flags |=MFD_EXEC ; -#endif pr_warn_once ("memfd_create() without MFD_EXEC nor MFD_NOEXEC_SEAL, pid=%d '%s'\n" ,task_pid_nr (current),get_task_comm (comm, current)); } +if (check_sysctl_memfd_noexec (&flags) <0 ) +return -EACCES ; +/* length includes terminating zero */ len =strnlen_user (uname,MFD_NAME_MAX_LEN +1 );if (len <=0 )
_
Patches currently in -mm which might be from [email protected] are