diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-21 02:30:41 -0700 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-26 13:17:58 -0700 |
commit | eddc0a3abff273842a94784d2d022bbc36dc9015 (patch) | |
tree | d1d4eea461dbd3b32e09079f00fccac6fde07e2c | |
parent | 751c644b95bb48aaa8825f0c66abbcc184d92051 (diff) | |
download | linux-stable-eddc0a3abff273842a94784d2d022bbc36dc9015.tar.gz linux-stable-eddc0a3abff273842a94784d2d022bbc36dc9015.tar.bz2 linux-stable-eddc0a3abff273842a94784d2d022bbc36dc9015.zip |
yama: Better permission check for ptraceme
Change the permission check for yama_ptrace_ptracee to the standard
ptrace permission check, testing if the traceer has CAP_SYS_PTRACE
in the tracees user namespace.
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r-- | security/yama/yama_lsm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index 23414b93771f..13c88fbcf037 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -347,10 +347,8 @@ int yama_ptrace_traceme(struct task_struct *parent) /* Only disallow PTRACE_TRACEME on more aggressive settings. */ switch (ptrace_scope) { case YAMA_SCOPE_CAPABILITY: - rcu_read_lock(); - if (!ns_capable(__task_cred(parent)->user_ns, CAP_SYS_PTRACE)) + if (!has_ns_capability(parent, current_user_ns(), CAP_SYS_PTRACE)) rc = -EPERM; - rcu_read_unlock(); break; case YAMA_SCOPE_NO_ATTACH: rc = -EPERM; |