summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>2009-05-26 14:16:31 +0900
committerJames Morris <jmorris@namei.org>2009-05-27 13:30:46 +1000
commit76b0187525f024cb391c8043adf2e359b2adb988 (patch)
tree5e94b6c2b2b0a9cb4e55a10e40fda7e0f6e5a70a
parent2c9e703c618106f5383226fbb1f526cb11034f8a (diff)
downloadlinux-stable-76b0187525f024cb391c8043adf2e359b2adb988.tar.gz
linux-stable-76b0187525f024cb391c8043adf2e359b2adb988.tar.bz2
linux-stable-76b0187525f024cb391c8043adf2e359b2adb988.zip
rootplug: Remove redundant initialization.
We don't need to explicitly initialize to cap_* because it will be filled by security_fixup_ops(). Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/root_plug.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/security/root_plug.c b/security/root_plug.c
index 40fb4f15e27b..2f7ffa67c4d2 100644
--- a/security/root_plug.c
+++ b/security/root_plug.c
@@ -71,18 +71,6 @@ static int rootplug_bprm_check_security (struct linux_binprm *bprm)
}
static struct security_operations rootplug_security_ops = {
- /* Use the capability functions for some of the hooks */
- .ptrace_may_access = cap_ptrace_may_access,
- .ptrace_traceme = cap_ptrace_traceme,
- .capget = cap_capget,
- .capset = cap_capset,
- .capable = cap_capable,
-
- .bprm_set_creds = cap_bprm_set_creds,
-
- .task_fix_setuid = cap_task_fix_setuid,
- .task_prctl = cap_task_prctl,
-
.bprm_check_security = rootplug_bprm_check_security,
};