Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[~andy/linux] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 082c320e4dbf0a4538b064f55814c72246852877..307c285af59e89141412181d547f0fca7d4c7073 100644 (file)
--- 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)