diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-22 09:39:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-22 09:39:10 -0700 |
| commit | 86c5bf7101991608483c93e7954b93acdc85ea57 (patch) | |
| tree | c66010150a6cc66df6ab0339f08cee3d623d78c7 /security | |
| parent | bfb7bfef6f9e8f113b892070fd622ae1c52e676b (diff) | |
| parent | d17af5056cf9e9fc05e68832f7c15687fcc12281 (diff) | |
| download | linux-exynos-86c5bf7101991608483c93e7954b93acdc85ea57.tar.gz linux-exynos-86c5bf7101991608483c93e7954b93acdc85ea57.tar.bz2 linux-exynos-86c5bf7101991608483c93e7954b93acdc85ea57.zip | |
Merge branch 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull vmap stack fixes from Ingo Molnar:
"This is fallout from CONFIG_HAVE_ARCH_VMAP_STACK=y on x86: stack
accesses that used to be just somewhat questionable are now totally
buggy.
These changes try to do it without breaking the ABI: the fields are
left there, they are just reporting zero, or reporting narrower
information (the maps file change)"
* 'mm-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
mm: Change vm_is_stack_for_task() to vm_is_stack_for_current()
fs/proc: Stop trying to report thread stacks
fs/proc: Stop reporting eip and esp in /proc/PID/stat
mm/numa: Remove duplicated include from mprotect.c
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 085057936287..09fd6108e421 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3557,7 +3557,7 @@ static int selinux_file_mprotect(struct vm_area_struct *vma, } else if (!vma->vm_file && ((vma->vm_start <= vma->vm_mm->start_stack && vma->vm_end >= vma->vm_mm->start_stack) || - vma_is_stack_for_task(vma, current))) { + vma_is_stack_for_current(vma))) { rc = current_has_perm(current, PROCESS__EXECSTACK); } else if (vma->vm_file && vma->anon_vma) { /* |