From: Richard Guy Briggs <rgb@redhat.com>
To: linux-security-module@vger.kernel.org, linux-audit@redhat.com,
linux-kernel@vger.kernel.org
Cc: Richard Guy Briggs <rgb@redhat.com>,
Kees Cook <keescook@chromium.org>,
Andy Lutomirski <luto@kernel.org>,
"Serge E . Hallyn" <serge.hallyn@ubuntu.com>,
James Morris <james.l.morris@oracle.com>,
Paul Moore <pmoore@redhat.com>, Steve Grubb <sgrubb@redhat.com>,
Eric Paris <eparis@redhat.com>
Subject: [PATCH GHAK16 V5 06/10] capabilities: move audit log decision to function
Date: Wed, 11 Oct 2017 20:57:10 -0400 [thread overview]
Message-ID: <9d2c4b37a1c7e6d9c58aff48037a0058cd2eff01.1507769413.git.rgb@redhat.com> (raw)
In-Reply-To: <cover.1507769413.git.rgb@redhat.com>
In-Reply-To: <cover.1507769413.git.rgb@redhat.com>
Move the audit log decision logic to its own function to isolate the
complexity in one place.
Suggested-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Reviewed-by: Serge Hallyn <serge@hallyn.com>
Acked-by: James Morris <james.l.morris@oracle.com>
Acked-by: Kees Cook <keescook@chromium.org>
Okay-ished-by: Paul Moore <paul@paul-moore.com>
---
security/commoncap.c | 50 ++++++++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/security/commoncap.c b/security/commoncap.c
index 421f743..d7f0cbd 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -765,6 +765,32 @@ static inline bool __is_setuid(struct cred *new, const struct cred *old)
static inline bool __is_setgid(struct cred *new, const struct cred *old)
{ return !gid_eq(new->egid, old->gid); }
+/*
+ * Audit candidate if current->cap_effective is set
+ *
+ * We do not bother to audit if 3 things are true:
+ * 1) cap_effective has all caps
+ * 2) we are root
+ * 3) root is supposed to have all caps (SECURE_NOROOT)
+ * Since this is just a normal root execing a process.
+ *
+ * Number 1 above might fail if you don't have a full bset, but I think
+ * that is interesting information to audit.
+ */
+static inline bool nonroot_raised_pE(struct cred *cred, kuid_t root)
+{
+ bool ret = false;
+
+ if (__cap_grew(effective, ambient, cred)) {
+ if (!__cap_full(effective, cred) ||
+ !__is_eff(root, cred) || !__is_real(root, cred) ||
+ !root_privileged()) {
+ ret = true;
+ }
+ }
+ return ret;
+}
+
/**
* cap_bprm_set_creds - Set up the proposed credentials for execve().
* @bprm: The execution parameters, including the proposed creds
@@ -841,26 +867,10 @@ int cap_bprm_set_creds(struct linux_binprm *bprm)
if (WARN_ON(!cap_ambient_invariant_ok(new)))
return -EPERM;
- /*
- * Audit candidate if current->cap_effective is set
- *
- * We do not bother to audit if 3 things are true:
- * 1) cap_effective has all caps
- * 2) we are root
- * 3) root is supposed to have all caps (SECURE_NOROOT)
- * Since this is just a normal root execing a process.
- *
- * Number 1 above might fail if you don't have a full bset, but I think
- * that is interesting information to audit.
- */
- if (__cap_grew(effective, ambient, new)) {
- if (!__cap_full(effective, new) ||
- !__is_eff(root_uid, new) || !__is_real(root_uid, new) ||
- !root_privileged()) {
- ret = audit_log_bprm_fcaps(bprm, new, old);
- if (ret < 0)
- return ret;
- }
+ if (nonroot_raised_pE(new, root_uid)) {
+ ret = audit_log_bprm_fcaps(bprm, new, old);
+ if (ret < 0)
+ return ret;
}
new->securebits &= ~issecure_mask(SECURE_KEEP_CAPS);
--
1.8.3.1
next prev parent reply other threads:[~2017-10-12 1:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 0:57 [PATCH GHAK16 V5 00/10] capabilities: do not audit log BPRM_FCAPS on set*id Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 01/10] capabilities: factor out cap_bprm_set_creds privileged root Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 02/10] capabilities: intuitive names for cap gain status Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 03/10] capabilities: rename has_cap to has_fcap Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 04/10] capabilities: use root_priveleged inline to clarify logic Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 05/10] capabilities: use intuitive names for id changes Richard Guy Briggs
2017-10-12 0:57 ` Richard Guy Briggs [this message]
2017-10-12 0:57 ` [PATCH GHAK16 V5 07/10] capabilities: remove a layer of conditional logic Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 08/10] capabilities: invert logic for clarity Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 09/10] capabilities: fix logic for effective root or real root Richard Guy Briggs
2017-10-12 0:57 ` [PATCH GHAK16 V5 10/10] capabilities: audit log other surprising conditions Richard Guy Briggs
2017-10-19 13:08 ` [PATCH GHAK16 V5 00/10] capabilities: do not audit log BPRM_FCAPS on set*id Richard Guy Briggs
2017-10-20 1:29 ` James Morris
2017-10-20 2:34 ` Richard Guy Briggs
2017-10-20 5:15 ` James Morris
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=9d2c4b37a1c7e6d9c58aff48037a0058cd2eff01.1507769413.git.rgb@redhat.com \
--to=rgb@redhat.com \
--cc=eparis@redhat.com \
--cc=james.l.morris@oracle.com \
--cc=keescook@chromium.org \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pmoore@redhat.com \
--cc=serge.hallyn@ubuntu.com \
--cc=sgrubb@redhat.com \
/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).