diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
| commit | fe47784ba5cbb6b713c013e046859946789b45e4 (patch) | |
| tree | 6384958d55e29be0d2eb8ae78fa437c10636d8d6 /security/root_plug.c | |
| parent | 83b8e28b14d63db928cb39e5c5ed2a548246bd71 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/xsave
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'security/root_plug.c')
| -rw-r--r-- | security/root_plug.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/root_plug.c b/security/root_plug.c index be0ebec2580b..c3f68b5b372d 100644 --- a/security/root_plug.c +++ b/security/root_plug.c | |||
| @@ -72,7 +72,8 @@ static int rootplug_bprm_check_security (struct linux_binprm *bprm) | |||
| 72 | 72 | ||
| 73 | static struct security_operations rootplug_security_ops = { | 73 | static struct security_operations rootplug_security_ops = { |
| 74 | /* Use the capability functions for some of the hooks */ | 74 | /* Use the capability functions for some of the hooks */ |
| 75 | .ptrace = cap_ptrace, | 75 | .ptrace_may_access = cap_ptrace_may_access, |
| 76 | .ptrace_traceme = cap_ptrace_traceme, | ||
| 76 | .capget = cap_capget, | 77 | .capget = cap_capget, |
| 77 | .capset_check = cap_capset_check, | 78 | .capset_check = cap_capset_check, |
| 78 | .capset_set = cap_capset_set, | 79 | .capset_set = cap_capset_set, |