selinux: remove secondary ops call to shm_shmat
authorJames Morris <jmorris@namei.org>
Thu, 29 Jan 2009 01:37:58 +0000 (12:37 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 29 Jan 2009 21:55:16 +0000 (08:55 +1100)
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>
security/selinux/hooks.c

index 25198e9896fae3984ee84133dc8e597f67e601d7..d9604794a4d2327eaee052a499b80458f1d4c023 100644 (file)
@@ -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;