diff options
author | James Morris <jmorris@namei.org> | 2009-01-28 19:28:33 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-01-29 16:55:01 -0500 |
commit | bc05595845f58c065adc0763a678187647ec040f (patch) | |
tree | b8126f1aadcac62f87ebd34fc44e48488ddf716e | |
parent | cd89596f0ccfa3ccb8a81ce47782231cf7ea7296 (diff) |
selinux: remove unused bprm_check_security hook
Remove unused bprm_check_security hook from SELinux. This
currently calls into the capabilities hook, which is a noop.
Acked-by: Eric Paris <eparis@redhat.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r-- | security/selinux/hooks.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 3bb4942e39cc..8251c6ba36c9 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -2182,11 +2182,6 @@ static int selinux_bprm_set_creds(struct linux_binprm *bprm) | |||
2182 | return 0; | 2182 | return 0; |
2183 | } | 2183 | } |
2184 | 2184 | ||
2185 | static int selinux_bprm_check_security(struct linux_binprm *bprm) | ||
2186 | { | ||
2187 | return secondary_ops->bprm_check_security(bprm); | ||
2188 | } | ||
2189 | |||
2190 | static int selinux_bprm_secureexec(struct linux_binprm *bprm) | 2185 | static int selinux_bprm_secureexec(struct linux_binprm *bprm) |
2191 | { | 2186 | { |
2192 | const struct cred *cred = current_cred(); | 2187 | const struct cred *cred = current_cred(); |
@@ -5608,7 +5603,6 @@ static struct security_operations selinux_ops = { | |||
5608 | .netlink_recv = selinux_netlink_recv, | 5603 | .netlink_recv = selinux_netlink_recv, |
5609 | 5604 | ||
5610 | .bprm_set_creds = selinux_bprm_set_creds, | 5605 | .bprm_set_creds = selinux_bprm_set_creds, |
5611 | .bprm_check_security = selinux_bprm_check_security, | ||
5612 | .bprm_committing_creds = selinux_bprm_committing_creds, | 5606 | .bprm_committing_creds = selinux_bprm_committing_creds, |
5613 | .bprm_committed_creds = selinux_bprm_committed_creds, | 5607 | .bprm_committed_creds = selinux_bprm_committed_creds, |
5614 | .bprm_secureexec = selinux_bprm_secureexec, | 5608 | .bprm_secureexec = selinux_bprm_secureexec, |