Skip to content

Commit

Permalink
selinux: remove secondary ops call to file_mprotect
Browse files Browse the repository at this point in the history
Remove secondary ops call to file_mprotect, which is
a noop in capabilities.

Acked-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
  • Loading branch information
James Morris committed Jan 29, 2009
1 parent 438add6 commit d541bbe
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -3056,18 +3056,13 @@ static int selinux_file_mprotect(struct vm_area_struct *vma,
unsigned long prot)
{
const struct cred *cred = current_cred();
int rc;

rc = secondary_ops->file_mprotect(vma, reqprot, prot);
if (rc)
return rc;

if (selinux_checkreqprot)
prot = reqprot;

#ifndef CONFIG_PPC32
if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
rc = 0;
int rc = 0;
if (vma->vm_start >= vma->vm_mm->start_brk &&
vma->vm_end <= vma->vm_mm->brk) {
rc = cred_has_perm(cred, cred, PROCESS__EXECHEAP);
Expand Down

0 comments on commit d541bbe

Please sign in to comment.