From a8c8368e16aa328fddb24f1f60e499b949a209b8 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Tue, 31 Jul 2012 20:37:00 +0900 Subject: [PATCH] --- yaml --- r: 329083 b: refs/heads/master c: 9f99798ff49e73dded73a8c674044ea6fb6af651 h: refs/heads/master i: 329081: 7d0df612ea11f6eed59a5fe5b6253b17b522cca1 329079: 3e66d29a3042df3ca0b1a13ad46e781479b4f329 v: v3 --- [refs] | 2 +- trunk/include/linux/ptrace.h | 2 -- trunk/kernel/ptrace.c | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c176f1030b51..23a60b09472d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de4bb3b9c788ea5504dfe094e34d831e8395075d +refs/heads/master: 9f99798ff49e73dded73a8c674044ea6fb6af651 diff --git a/trunk/include/linux/ptrace.h b/trunk/include/linux/ptrace.h index 597e4fdb97fe..3db698aee34c 100644 --- a/trunk/include/linux/ptrace.h +++ b/trunk/include/linux/ptrace.h @@ -130,8 +130,6 @@ extern void exit_ptrace(struct task_struct *tracer); #define PTRACE_MODE_READ 0x01 #define PTRACE_MODE_ATTACH 0x02 #define PTRACE_MODE_NOAUDIT 0x04 -/* Returns 0 on success, -errno on denial. */ -extern int __ptrace_may_access(struct task_struct *task, unsigned int mode); /* Returns true on success, false on denial. */ extern bool ptrace_may_access(struct task_struct *task, unsigned int mode); diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c index a232bb59d93f..1f5e55dda955 100644 --- a/trunk/kernel/ptrace.c +++ b/trunk/kernel/ptrace.c @@ -180,7 +180,8 @@ static int ptrace_has_cap(struct user_namespace *ns, unsigned int mode) return has_ns_capability(current, ns, CAP_SYS_PTRACE); } -int __ptrace_may_access(struct task_struct *task, unsigned int mode) +/* Returns 0 on success, -errno on denial. */ +static int __ptrace_may_access(struct task_struct *task, unsigned int mode) { const struct cred *cred = current_cred(), *tcred;