From: casey.schaufler@intel.com (Casey Schaufler)
To: linux-security-module@vger.kernel.org
Subject: [PATCH v5 4/5] Capability: Complete PTRACE_MODE_SCHED
Date: Wed, 26 Sep 2018 13:34:45 -0700 [thread overview]
Message-ID: <20180926203446.2004-5-casey.schaufler@intel.com> (raw)
In-Reply-To: <20180926203446.2004-1-casey.schaufler@intel.com>
From: Casey Schaufler <casey@schaufler-ca.com>
Allow a complete ptrace access check with mode PTRACE_MODE_SCHED.
Disable the inappropriate privilege check in the capability code
that does incompatible locking.
Signed-off-by: Casey Schaufler <casey.schaufler@intel.com>
---
kernel/ptrace.c | 2 --
security/commoncap.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 99cfddde6a55..0b6a9df51c3b 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -331,8 +331,6 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
!ptrace_has_cap(mm->user_ns, mode)))
return -EPERM;
- if (mode & PTRACE_MODE_SCHED)
- return 0;
return security_ptrace_access_check(task, mode);
}
diff --git a/security/commoncap.c b/security/commoncap.c
index 2e489d6a3ac8..e77457110d05 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -152,6 +152,8 @@ int cap_ptrace_access_check(struct task_struct *child, unsigned int mode)
if (cred->user_ns == child_cred->user_ns &&
cap_issubset(child_cred->cap_permitted, *caller_caps))
goto out;
+ if (mode & PTRACE_MODE_SCHED)
+ goto out;
if (ns_capable(child_cred->user_ns, CAP_SYS_PTRACE))
goto out;
ret = -EPERM;
--
2.17.1
next prev parent reply other threads:[~2018-09-26 20:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-26 20:34 [PATCH v5 0/5] LSM: Support ptrace sidechannel access checks Casey Schaufler
2018-09-26 20:34 ` [PATCH v5 1/5] AppArmor: Prepare for PTRACE_MODE_SCHED Casey Schaufler
2018-09-26 21:16 ` Jann Horn
2018-09-26 21:18 ` Jann Horn
2018-09-26 22:47 ` Schaufler, Casey
2018-09-26 20:34 ` [PATCH v5 2/5] Smack: " Casey Schaufler
2018-09-26 21:30 ` Jann Horn
2018-09-26 22:53 ` Schaufler, Casey
2018-09-26 22:58 ` Jann Horn
2018-10-04 7:47 ` Jiri Kosina
2018-10-04 11:36 ` Jann Horn
2018-10-16 11:44 ` Jiri Kosina
2018-09-26 20:34 ` [PATCH v5 3/5] SELinux: " Casey Schaufler
2018-09-27 15:50 ` Stephen Smalley
2018-09-27 16:23 ` Schaufler, Casey
2018-09-26 20:34 ` Casey Schaufler [this message]
2018-09-26 21:26 ` [PATCH v5 4/5] Capability: Complete PTRACE_MODE_SCHED Jann Horn
2018-09-26 22:24 ` Schaufler, Casey
2018-09-26 20:34 ` [PATCH v5 5/5] sidechannel: Linux Security Module for sidechannel Casey Schaufler
2018-09-27 21:45 ` James Morris
2018-09-27 22:39 ` Casey Schaufler
2018-09-27 22:47 ` James Morris
2018-09-27 23:19 ` Schaufler, Casey
2018-09-27 23:43 ` James Morris
2018-09-27 23:47 ` Jann Horn
2018-09-28 16:33 ` James Morris
2018-09-28 17:40 ` Schaufler, Casey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180926203446.2004-5-casey.schaufler@intel.com \
--to=casey.schaufler@intel.com \
--cc=linux-security-module@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).