diff options
| author | James Morris <jmorris@namei.org> | 2009-01-29 12:37:58 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-01-30 08:55:16 +1100 |
| commit | 95c14904b6f6f8a35365f0c58d530c85b4fb96b4 (patch) | |
| tree | a228c81abe6409c61f7c90f7cebeebcb3da902af /security/selinux | |
| parent | 5c4054ccfafb6a446e9b65c524af1741656c6c60 (diff) | |
| download | linux-95c14904b6f6f8a35365f0c58d530c85b4fb96b4.tar.gz | |
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>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/hooks.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 25198e9896fa..d9604794a4d2 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; |