summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-30 14:25:41 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-30 14:25:41 +1000
commitc31bf695d5fdec77e95af0bf9c275d7e2f4e49f1 (patch)
treee6ca82df154b76fab57958a943e81508bf07c116 /kernel
parenta3f156938f0ff54e5c4c81f613a31b1d682f9fba (diff)
parent967cc5371113f9806b39a2ebb2174af2883d96fe (diff)
Merge commit 'security-testing/next'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 082c320e4dbf..307c285af59e 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -152,7 +152,7 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
if (!dumpable && !capable(CAP_SYS_PTRACE))
return -EPERM;
- return security_ptrace_may_access(task, mode);
+ return security_ptrace_access_check(task, mode);
}
bool ptrace_may_access(struct task_struct *task, unsigned int mode)