From: Eric Paris <eparis@redhat.com>
Date: Wed, 29 Apr 2009 18:00:25 +0000 (-0400)
Subject: SELinux: drop secondary_ops->sysctl
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=88c48db9788862d0290831d081bc3c64e13b592f;p=deliverable%2Flinux.git

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>
---

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) ?