On Wed, 23 Aug 2017, Richard Guy Briggs wrote:
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(a)redhat.com>
Acked-by: James Morris <james.l.morris(a)oracle.com>
---
security/commoncap.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/security/commoncap.c b/security/commoncap.c
index ffcaff0..eb2da69 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -552,10 +552,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;
}
--
James Morris
<jmorris(a)namei.org>