From 59362018d96238be5a515a289b6305a61cf80899 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Thu, 29 Jan 2009 12:19:51 +1100
Subject: [PATCH] --- yaml --- r: 132587 b: refs/heads/master c:
 d541bbee6902d5ffb8a03d63ac8f4b1364c2ff93 h: refs/heads/master i:   132585:
 d128df0d95462c22cbf67a03fb61d7378d9580b4   132583:
 63d69d0f940e2c5b70004134b7be6d1b80ec81c9 v: v3

---
 [refs]                         | 2 +-
 trunk/security/selinux/hooks.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b3d924e5f98d..97397fd3fd53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 438add6b32d9295db6e3ecd4d9e137086ec5b5d9
+refs/heads/master: d541bbee6902d5ffb8a03d63ac8f4b1364c2ff93
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 08b506846a1f..2c98071fba8b 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/security/selinux/hooks.c
@@ -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);