diff --git a/[refs] b/[refs] index c02c1e99f1f7..84ae48da9b4c 100644 --- 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 index 25198e9896fa..d9604794a4d2 100644 --- 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;