From 1f09ccba3244583aca77f1513317843d456bac75 Mon Sep 17 00:00:00 2001 From: James Morris Date: Thu, 29 Jan 2009 11:28:33 +1100 Subject: [PATCH] --- yaml --- r: 132576 b: refs/heads/master c: bc05595845f58c065adc0763a678187647ec040f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3e641f70b31a..cd60970317ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd89596f0ccfa3ccb8a81ce47782231cf7ea7296 +refs/heads/master: bc05595845f58c065adc0763a678187647ec040f diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 3bb4942e39cc..8251c6ba36c9 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -2182,11 +2182,6 @@ static int selinux_bprm_set_creds(struct linux_binprm *bprm) return 0; } -static int selinux_bprm_check_security(struct linux_binprm *bprm) -{ - return secondary_ops->bprm_check_security(bprm); -} - static int selinux_bprm_secureexec(struct linux_binprm *bprm) { const struct cred *cred = current_cred(); @@ -5608,7 +5603,6 @@ static struct security_operations selinux_ops = { .netlink_recv = selinux_netlink_recv, .bprm_set_creds = selinux_bprm_set_creds, - .bprm_check_security = selinux_bprm_check_security, .bprm_committing_creds = selinux_bprm_committing_creds, .bprm_committed_creds = selinux_bprm_committed_creds, .bprm_secureexec = selinux_bprm_secureexec,