---

yaml --- r: 132593 b: refs/heads/master c: 95c1490 h: refs/heads/master i: 132591: 8a68145 v: v3
git-mirror · Jan 29, 2009 · c50b8b3 · c50b8b3
1 parent b9217f6
commit c50b8b3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c4054ccfafb6a446e9b65c524af1741656c6c60
+refs/heads/master: 95c14904b6f6f8a35365f0c58d530c85b4fb96b4
diff --git a/trunk/security/selinux/hooks.c b/trunk/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;