diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 18:32:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 18:32:13 -0400 |
| commit | 71ef2a46fce43042a60d7ccbf55ecbd789c03c2e (patch) | |
| tree | 247c3e25958ff362b8a7b5b735a1e7d2ef6842c7 /security/root_plug.c | |
| parent | d121db94eb50b29a202b5f6a8671cbebdf2c4142 (diff) | |
| parent | 5cd9c58fbe9ec92b45b27e131719af4f2bd9eb40 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
security: Fix setting of PF_SUPERPRIV by __capable()
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, |