summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-04-29 14:00:25 -0400
committerJames Morris <jmorris@namei.org>2009-04-30 08:45:56 +1000
commit88c48db9788862d0290831d081bc3c64e13b592f (patch)
tree5d0e0aedd2c5c0ea8db4007cac66f930ddbe73d7 /security
parent19e4529ee7345079eeacc8e40cf69a304a64dc23 (diff)
downloadlinux-stable-88c48db9788862d0290831d081bc3c64e13b592f.tar.gz
linux-stable-88c48db9788862d0290831d081bc3c64e13b592f.tar.bz2
linux-stable-88c48db9788862d0290831d081bc3c64e13b592f.zip
SELinux: drop secondary_ops->sysctl
We are still calling secondary_ops->sysctl even though the capabilities module does not define a sysctl operation. Signed-off-by: Eric Paris <eparis@redhat.com> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index ba808ef6babb..dd19ba81201f 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1980,10 +1980,6 @@ static int selinux_sysctl(ctl_table *table, int op)
u32 tsid, sid;
int rc;
- rc = secondary_ops->sysctl(table, op);
- if (rc)
- return rc;
-
sid = current_sid();
rc = selinux_sysctl_get_sid(table, (op == 0001) ?