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>
This commit is contained in:
Richard Guy Briggs 2017-10-11 20:57:12 -04:00 committed by James Morris
parent 02ebbaf48c
commit c0d1adefe0

View File

@ -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;
}