diff options
author | Jonathan Corbet | 2016-11-19 00:13:41 +0100 |
---|---|---|
committer | Jonathan Corbet | 2016-11-19 00:13:41 +0100 |
commit | 917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) | |
tree | b5932aab90d449841803b6f8679a4564ca2a6eaf /security/selinux/hooks.c | |
parent | kernel-doc: add support for one line inline struct member doc comments (diff) | |
parent | Linux 4.9-rc4 (diff) | |
download | kernel-qcow2-linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.gz kernel-qcow2-linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.xz kernel-qcow2-linux-917fef6f7ee8b2fe852692ac49771342bfef9433.zip |
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
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) { /* |