c/r: prctl: Drop VMA flags test on PR_SET_MM_ stack data assignment
From: Cyrill Gorcunov <[email protected]>
With the
| commit b76437579d1344b612cf1851ae610c636cec7db0 | Author: Siddhesh Poyarekar <[email protected]> | Date: Wed Mar 21 16:34:04 2012 -0700 | | procfs: mark thread stack correctly in proc/<pid>/maps
the stack allocated via clone() is marked in /proc/<pid>/maps as [stack:%d] thus it might be out of the former mm->start_stack/end_stack values (and even has some custom VMA flags set). So to be able to restore mm->start_stack/end_stack drop vma flags test, but still require the undrlied VMA to exist.
As always note this feature is under CONFIG_CHECKPOINT_RESTORE and requires CAP_SYS_RESOURCE to be granted.
--- kernel/sys.c | 14 -------------- 1 file changed, 14 deletions(-)
kernel/sys.c +0 -14
@@ -1704,14 +1704,6 @@ SYSCALL_DEFINE1(umask, int, mask) }#ifdef CONFIG_CHECKPOINT_RESTORE -static bool vma_flags_mismatch (struct vm_area_struct *vma, -unsigned long required, -unsigned long banned) -{ -return (vma->vm_flags & required) != required || - (vma->vm_flags & banned); -} -static int prctl_set_mm_exe_file (struct mm_struct *mm,unsigned int fd) {struct file *exe_file;
@@ -1842,12 +1834,6 @@ static int prctl_set_mm(int opt, unsigne error = -EFAULT ; goto out; } -#ifdef CONFIG_STACK_GROWSUP -if (vma_flags_mismatch (vma,VM_READ |VM_WRITE |VM_GROWSUP ,0 )) -#else - if (vma_flags_mismatch(vma, VM_READ | VM_WRITE | VM_GROWSDOWN, 0)) -#endif - goto out;if (opt ==PR_SET_MM_START_STACK ) mm->start_stack = addr;else if (opt ==PR_SET_MM_ARG_START )
Kees Cook
Acked-byQuoted 16 lines · Cyrill Gorcunov
From: Cyrill Gorcunov <[email protected]>
With the
| commit b76437579d1344b612cf1851ae610c636cec7db0 | Author: Siddhesh Poyarekar <[email protected]> | Date: Wed Mar 21 16:34:04 2012 -0700 | | procfs: mark thread stack correctly in proc/<pid>/mapsthe stack allocated via
clone()is marked in /proc/<pid>/maps as [stack:%d] thus it might be out of the former mm->start_stack/end_stack values (and even has some custom VMA flags set). So to be able to restore mm->start_stack/end_stack drop vma flags test, but still require the undrlied VMA to exist.
Quoted 4 lines
As always note this feature is under
CONFIG_CHECKPOINT_RESTOREand requiresCAP_SYS_RESOURCEto be granted.Signed-off-by Cyrill Gorcunov <[email protected]>
It'd be nice if there was some sensible per-thread kernel record of where the stack is expected to be. Regardless:
Signature · 2 lines
Kees Cook Chrome OS Security