LKML Archive on lore.kernel.org
 help / color / Atom feed
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 08/10] capabilities: invert logic for clarity
Date: Wed, 11 Oct 2017 20:57:12 -0400
Message-ID: <f06e74e9a38b83ec273196bce727295b828c5870.1507769413.git.rgb@redhat.com> (raw)
In-Reply-To: <cover.1507769413.git.rgb@redhat.com>
In-Reply-To: <cover.1507769413.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>
Acked-by: Kees Cook <keescook@chromium.org>
Okay-ished-by: Paul Moore <paul@paul-moore.com>
---
 security/commoncap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index eac70e2..0bd94d3 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -782,10 +782,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.8.3.1

  parent reply index

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 ` [PATCH GHAK16 V5 06/10] capabilities: move audit log decision to function Richard Guy Briggs
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 ` Richard Guy Briggs [this message]
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=f06e74e9a38b83ec273196bce727295b828c5870.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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
	git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
	git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git
	git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git
	git clone --mirror https://lore.kernel.org/lkml/10 lkml/git/10.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org
	public-inbox-index lkml

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git