From: James Morris <jmorris@namei.org>
Date: Thu, 29 Jan 2009 01:37:58 +0000 (+1100)
Subject: selinux: remove secondary ops call to shm_shmat
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=95c14904b6f6f8a35365f0c58d530c85b4fb96b4;p=linux-2.6-omap-h63xx.git

selinux: remove secondary ops call to shm_shmat

Remove secondary ops call to shm_shmat, 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>
---

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 25198e9896f..d9604794a4d 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5113,11 +5113,6 @@ static int selinux_shm_shmat(struct shmid_kernel *shp,
 			     char __user *shmaddr, int shmflg)
 {
 	u32 perms;
-	int rc;
-
-	rc = secondary_ops->shm_shmat(shp, shmaddr, shmflg);
-	if (rc)
-		return rc;
 
 	if (shmflg & SHM_RDONLY)
 		perms = SHM__READ;