diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:41:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-01 07:41:06 +0100 |
| commit | 05b93c19d50af2bd0d30fc000d817418ae8d33f1 (patch) | |
| tree | dbfbd3f3bc13789e6450112c2013d7a2b042bdb9 /security/selinux/hooks.c | |
| parent | x86/unwind: Ensure stack grows down (diff) | |
| parent | Merge tag 'spi-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| download | linux-rng-05b93c19d50af2bd0d30fc000d817418ae8d33f1.tar.xz linux-rng-05b93c19d50af2bd0d30fc000d817418ae8d33f1.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/selinux/hooks.c')
| -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) { /* |