All of lore.kernel.org
 help / color / mirror / Atom feed
From: rgb@redhat.com (Richard Guy Briggs)
To: linux-security-module@vger.kernel.org
Subject: [PATCH V4 08/10] capabilities: invert logic for clarity
Date: Tue,  5 Sep 2017 02:46:08 -0400	[thread overview]
Message-ID: <a5a0cb250461fe22fdb1ef250aaf35ecdbcbf1d4.1504591358.git.rgb@redhat.com> (raw)
In-Reply-To: <cover.1504591358.git.rgb@redhat.com>

The way the logic was presented, it was awkward to read and verify.
Invert the logic using DeMorgan's Law to be more easily able to read and
understand.

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>
---
 security/commoncap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index cf95d73..7e8041d 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -544,10 +544,10 @@ static inline bool nonroot_raised_pE(struct cred *cred, kuid_t root)
 	bool ret = false;
 
 	if (__cap_grew(effective, ambient, cred) &&
-	    (!__cap_full(effective, cred) ||
-	     !__is_eff(root, cred) ||
-	     !__is_real(root, cred) ||
-	     !root_privileged()))
+	    !(__cap_full(effective, cred) &&
+	      __is_eff(root, cred) &&
+	      __is_real(root, cred) &&
+	      root_privileged()))
 		ret = true;
 	return ret;
 }
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)
From: Richard Guy Briggs <rgb@redhat.com>
To: linux-security-module@vger.kernel.org, linux-audit@redhat.com
Cc: Richard Guy Briggs <rgb@redhat.com>,
	Andy Lutomirski <luto@kernel.org>,
	"Serge E. Hallyn" <serge.hallyn@ubuntu.com>,
	Kees Cook <keescook@chromium.org>,
	James Morris <james.l.morris@oracle.com>,
	Eric Paris <eparis@redhat.com>, Paul Moore <pmoore@redhat.com>,
	Steve Grubb <sgrubb@redhat.com>
Subject: [PATCH V4 08/10] capabilities: invert logic for clarity
Date: Tue,  5 Sep 2017 02:46:08 -0400	[thread overview]
Message-ID: <a5a0cb250461fe22fdb1ef250aaf35ecdbcbf1d4.1504591358.git.rgb@redhat.com> (raw)
In-Reply-To: <cover.1504591358.git.rgb@redhat.com>
In-Reply-To: <cover.1504591358.git.rgb@redhat.com>

The way the logic was presented, it was awkward to read and verify.
Invert the logic using DeMorgan's Law to be more easily able to read and
understand.

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>
---
 security/commoncap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index cf95d73..7e8041d 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -544,10 +544,10 @@ static inline bool nonroot_raised_pE(struct cred *cred, kuid_t root)
 	bool ret = false;
 
 	if (__cap_grew(effective, ambient, cred) &&
-	    (!__cap_full(effective, cred) ||
-	     !__is_eff(root, cred) ||
-	     !__is_real(root, cred) ||
-	     !root_privileged()))
+	    !(__cap_full(effective, cred) &&
+	      __is_eff(root, cred) &&
+	      __is_real(root, cred) &&
+	      root_privileged()))
 		ret = true;
 	return ret;
 }
-- 
1.7.1


  parent reply	other threads:[~2017-09-05  6:46 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-05  6:46 [PATCH V4 00/10] capabilities: do not audit log BPRM_FCAPS on set*id Richard Guy Briggs
2017-09-05  6:46 ` Richard Guy Briggs
2017-09-05  6:46 ` [PATCH V4 01/10] capabilities: factor out cap_bprm_set_creds privileged root Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-06  6:05   ` James Morris
2017-09-06  6:05     ` James Morris
2017-09-07 19:42   ` Kees Cook
2017-09-07 19:42     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 02/10] capabilities: intuitive names for cap gain status Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-07 19:57   ` Kees Cook
2017-09-07 19:57     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 03/10] capabilities: rename has_cap to has_fcap Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:15   ` Kees Cook
2017-09-08 18:15     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 04/10] capabilities: use root_priveleged inline to clarify logic Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:18   ` Kees Cook
2017-09-08 18:18     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 05/10] capabilities: use intuitive names for id changes Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:22   ` Kees Cook
2017-09-08 18:22     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 06/10] capabilities: move audit log decision to function Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:23   ` Kees Cook
2017-09-08 18:23     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 07/10] capabilities: remove a layer of conditional logic Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:26   ` Kees Cook
2017-09-08 18:26     ` Kees Cook
2017-09-05  6:46 ` Richard Guy Briggs [this message]
2017-09-05  6:46   ` [PATCH V4 08/10] capabilities: invert logic for clarity Richard Guy Briggs
2017-09-08 18:27   ` Kees Cook
2017-09-08 18:27     ` Kees Cook
2017-09-05  6:46 ` [PATCH V4 09/10] capabilities: fix logic for effective root or real root Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:34   ` Kees Cook
2017-09-08 18:34     ` Kees Cook
2017-09-20 22:11   ` Paul Moore
2017-09-20 22:11     ` Paul Moore
2017-09-20 22:25     ` Kees Cook
2017-09-20 22:25       ` Kees Cook
2017-09-20 22:27       ` Paul Moore
2017-09-20 22:27         ` Paul Moore
2017-09-05  6:46 ` [PATCH V4 10/10] capabilities: audit log other surprising conditions Richard Guy Briggs
2017-09-05  6:46   ` Richard Guy Briggs
2017-09-08 18:36   ` Kees Cook
2017-09-08 18:36     ` Kees Cook
2017-09-20 22:22   ` Paul Moore
2017-09-20 22:22     ` Paul Moore
2017-09-08 17:02 ` [PATCH V4 00/10] capabilities: do not audit log BPRM_FCAPS on set*id Paul Moore
2017-09-08 17:02   ` Paul Moore
2017-09-14  5:54   ` Richard Guy Briggs
2017-09-14  5:54     ` Richard Guy Briggs
2017-09-14  6:46     ` Paul Moore
2017-09-14  6:46       ` Paul Moore
2017-09-14  6:49       ` Paul Moore
2017-09-14  6:49         ` Paul Moore

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=a5a0cb250461fe22fdb1ef250aaf35ecdbcbf1d4.1504591358.git.rgb@redhat.com \
    --to=rgb@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.