diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 15:32:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 15:32:13 -0700 |
| commit | 71ef2a46fce43042a60d7ccbf55ecbd789c03c2e (patch) | |
| tree | 247c3e25958ff362b8a7b5b735a1e7d2ef6842c7 /security/security.c | |
| parent | d121db94eb50b29a202b5f6a8671cbebdf2c4142 (diff) | |
| parent | 5cd9c58fbe9ec92b45b27e131719af4f2bd9eb40 (diff) | |
| download | kernel-crypto-71ef2a46fce43042a60d7ccbf55ecbd789c03c2e.tar.gz kernel-crypto-71ef2a46fce43042a60d7ccbf55ecbd789c03c2e.tar.xz kernel-crypto-71ef2a46fce43042a60d7ccbf55ecbd789c03c2e.zip | |
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/security.c')
| -rw-r--r-- | security/security.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c index ff706872775..3a4b4f55b33 100644 --- a/security/security.c +++ b/security/security.c @@ -127,10 +127,14 @@ int register_security(struct security_operations *ops) /* Security operations */ -int security_ptrace(struct task_struct *parent, struct task_struct *child, - unsigned int mode) +int security_ptrace_may_access(struct task_struct *child, unsigned int mode) { - return security_ops->ptrace(parent, child, mode); + return security_ops->ptrace_may_access(child, mode); +} + +int security_ptrace_traceme(struct task_struct *parent) +{ + return security_ops->ptrace_traceme(parent); } int security_capget(struct task_struct *target, |