aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2017-10-11 20:57:12 -0400
committerJames Morris <james.l.morris@oracle.com>2017-10-20 00:22:45 -0400
commitc0d1adefe0a3775cc16374dc9ebdfd8504afa14b (patch)
tree36d750f04d341a6e41f6eaccfe3307a29768cd81
parent02ebbaf48cf211498a9bd2c6b65e7d1b0a901807 (diff)
capabilities: invert logic for clarity
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> Signed-off-by: James Morris <james.l.morris@oracle.com>
-rw-r--r--security/commoncap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index eac70e2b400b..0bd94d36e635 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)
782 bool ret = false; 782 bool ret = false;
783 783
784 if (__cap_grew(effective, ambient, cred) && 784 if (__cap_grew(effective, ambient, cred) &&
785 (!__cap_full(effective, cred) || 785 !(__cap_full(effective, cred) &&
786 !__is_eff(root, cred) || 786 __is_eff(root, cred) &&
787 !__is_real(root, cred) || 787 __is_real(root, cred) &&
788 !root_privileged())) 788 root_privileged()))
789 ret = true; 789 ret = true;
790 return ret; 790 return ret;
791} 791}