From: serge@hallyn.com (Serge E. Hallyn) To: linux-security-module@vger.kernel.org Subject: [PATCH V3 05/10] capabilities: use intuitive names for id changes Date: Thu, 24 Aug 2017 11:17:20 -0500 [thread overview] Message-ID: <20170824161719.GE10515@mail.hallyn.com> (raw) In-Reply-To: <1360ed3437f87ac0b9e076ff5ea05c67ee8a7ed8.1503459890.git.rgb@redhat.com> Quoting Richard Guy Briggs (rgb at redhat.com): > Introduce a number of inlines to make the use of the negation of > uid_eq() easier to read and analyse. > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Reviewed-by: Serge Hallyn <serge@hallyn.com> > --- > security/commoncap.c | 26 +++++++++++++++++++++----- > 1 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/security/commoncap.c b/security/commoncap.c > index 36c38a1..1af7dec 100644 > --- a/security/commoncap.c > +++ b/security/commoncap.c > @@ -483,6 +483,15 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_f > > static inline bool root_privileged(void) { return !issecure(SECURE_NOROOT); } > > +static inline bool is_real(kuid_t uid, struct cred *cred) > +{ return uid_eq(cred->uid, uid); } > + > +static inline bool is_eff(kuid_t uid, struct cred *cred) > +{ return uid_eq(cred->euid, uid); } > + > +static inline bool is_suid(kuid_t uid, struct cred *cred) > +{ return !is_real(uid, cred) && is_eff(uid, cred); } > + > void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effective, kuid_t root_uid) > { > const struct cred *old = current_cred(); > @@ -493,7 +502,7 @@ void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effe > * for a setuid root binary run by a non-root user. Do set it > * for a root user just to cause least surprise to an admin. > */ > - if (has_fcap && !uid_eq(new->uid, root_uid) && uid_eq(new->euid, root_uid)) { > + if (has_fcap && is_suid(root_uid, new)) { > warn_setuid_and_fcaps_mixed(bprm->filename); > return; > } > @@ -504,12 +513,12 @@ void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effe > * > * If only the real uid is 0, we do not set the effective bit. > */ > - if (uid_eq(new->euid, root_uid) || uid_eq(new->uid, root_uid)) { > + if (is_eff(root_uid, new) || is_real(root_uid, new)) { > /* pP' = (cap_bset & ~0) | (pI & ~0) */ > new->cap_permitted = cap_combine(old->cap_bset, > old->cap_inheritable); > } > - if (uid_eq(new->euid, root_uid)) > + if (is_eff(root_uid, new)) > *effective = true; > } > > @@ -519,6 +528,13 @@ void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effe > !cap_issubset(cred->cap_##target, cred->cap_##source) > #define cap_full(field, cred) \ > cap_issubset(CAP_FULL_SET, cred->cap_##field) > + > +static inline bool is_setuid(struct cred *new, const struct cred *old) > +{ return !uid_eq(new->euid, old->uid); } > + > +static inline bool is_setgid(struct cred *new, const struct cred *old) > +{ return !gid_eq(new->egid, old->gid); } > + > /** > * cap_bprm_set_creds - Set up the proposed credentials for execve(). > * @bprm: The execution parameters, including the proposed creds > @@ -556,7 +572,7 @@ int cap_bprm_set_creds(struct linux_binprm *bprm) > * > * In addition, if NO_NEW_PRIVS, then ensure we get no new privs. > */ > - is_setid = !uid_eq(new->euid, old->uid) || !gid_eq(new->egid, old->gid); > + is_setid = is_setuid(new, old) || is_setgid(new, old); > > if ((is_setid || cap_gained(permitted, new, old)) && > ((bprm->unsafe & ~LSM_UNSAFE_PTRACE) || > @@ -612,7 +628,7 @@ int cap_bprm_set_creds(struct linux_binprm *bprm) > */ > if (cap_grew(effective, ambient, new)) { > if (!cap_full(effective, new) || > - !uid_eq(new->euid, root_uid) || !uid_eq(new->uid, root_uid) || > + !is_eff(root_uid, new) || !is_real(root_uid, new) || > !root_privileged()) { > ret = audit_log_bprm_fcaps(bprm, new, old); > if (ret < 0) > -- > 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: "Serge E. Hallyn" <serge@hallyn.com> To: Richard Guy Briggs <rgb@redhat.com> Cc: linux-security-module@vger.kernel.org, linux-audit@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: Re: [PATCH V3 05/10] capabilities: use intuitive names for id changes Date: Thu, 24 Aug 2017 11:17:20 -0500 [thread overview] Message-ID: <20170824161719.GE10515@mail.hallyn.com> (raw) In-Reply-To: <1360ed3437f87ac0b9e076ff5ea05c67ee8a7ed8.1503459890.git.rgb@redhat.com> Quoting Richard Guy Briggs (rgb@redhat.com): > Introduce a number of inlines to make the use of the negation of > uid_eq() easier to read and analyse. > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Reviewed-by: Serge Hallyn <serge@hallyn.com> > --- > security/commoncap.c | 26 +++++++++++++++++++++----- > 1 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/security/commoncap.c b/security/commoncap.c > index 36c38a1..1af7dec 100644 > --- a/security/commoncap.c > +++ b/security/commoncap.c > @@ -483,6 +483,15 @@ static int get_file_caps(struct linux_binprm *bprm, bool *effective, bool *has_f > > static inline bool root_privileged(void) { return !issecure(SECURE_NOROOT); } > > +static inline bool is_real(kuid_t uid, struct cred *cred) > +{ return uid_eq(cred->uid, uid); } > + > +static inline bool is_eff(kuid_t uid, struct cred *cred) > +{ return uid_eq(cred->euid, uid); } > + > +static inline bool is_suid(kuid_t uid, struct cred *cred) > +{ return !is_real(uid, cred) && is_eff(uid, cred); } > + > void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effective, kuid_t root_uid) > { > const struct cred *old = current_cred(); > @@ -493,7 +502,7 @@ void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effe > * for a setuid root binary run by a non-root user. Do set it > * for a root user just to cause least surprise to an admin. > */ > - if (has_fcap && !uid_eq(new->uid, root_uid) && uid_eq(new->euid, root_uid)) { > + if (has_fcap && is_suid(root_uid, new)) { > warn_setuid_and_fcaps_mixed(bprm->filename); > return; > } > @@ -504,12 +513,12 @@ void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effe > * > * If only the real uid is 0, we do not set the effective bit. > */ > - if (uid_eq(new->euid, root_uid) || uid_eq(new->uid, root_uid)) { > + if (is_eff(root_uid, new) || is_real(root_uid, new)) { > /* pP' = (cap_bset & ~0) | (pI & ~0) */ > new->cap_permitted = cap_combine(old->cap_bset, > old->cap_inheritable); > } > - if (uid_eq(new->euid, root_uid)) > + if (is_eff(root_uid, new)) > *effective = true; > } > > @@ -519,6 +528,13 @@ void handle_privileged_root(struct linux_binprm *bprm, bool has_fcap, bool *effe > !cap_issubset(cred->cap_##target, cred->cap_##source) > #define cap_full(field, cred) \ > cap_issubset(CAP_FULL_SET, cred->cap_##field) > + > +static inline bool is_setuid(struct cred *new, const struct cred *old) > +{ return !uid_eq(new->euid, old->uid); } > + > +static inline bool is_setgid(struct cred *new, const struct cred *old) > +{ return !gid_eq(new->egid, old->gid); } > + > /** > * cap_bprm_set_creds - Set up the proposed credentials for execve(). > * @bprm: The execution parameters, including the proposed creds > @@ -556,7 +572,7 @@ int cap_bprm_set_creds(struct linux_binprm *bprm) > * > * In addition, if NO_NEW_PRIVS, then ensure we get no new privs. > */ > - is_setid = !uid_eq(new->euid, old->uid) || !gid_eq(new->egid, old->gid); > + is_setid = is_setuid(new, old) || is_setgid(new, old); > > if ((is_setid || cap_gained(permitted, new, old)) && > ((bprm->unsafe & ~LSM_UNSAFE_PTRACE) || > @@ -612,7 +628,7 @@ int cap_bprm_set_creds(struct linux_binprm *bprm) > */ > if (cap_grew(effective, ambient, new)) { > if (!cap_full(effective, new) || > - !uid_eq(new->euid, root_uid) || !uid_eq(new->uid, root_uid) || > + !is_eff(root_uid, new) || !is_real(root_uid, new) || > !root_privileged()) { > ret = audit_log_bprm_fcaps(bprm, new, old); > if (ret < 0) > -- > 1.7.1
next prev parent reply other threads:[~2017-08-24 16:17 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-23 10:12 [PATCH V3 00/10] capabilities: do not audit log BPRM_FCAPS on set*id Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-23 10:12 ` [PATCH V3 01/10] capabilities: factor out cap_bprm_set_creds privileged root Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 15:42 ` Serge E. Hallyn 2017-08-24 15:42 ` Serge E. Hallyn 2017-08-25 5:55 ` James Morris 2017-08-25 5:55 ` James Morris 2017-08-25 10:49 ` Richard Guy Briggs 2017-08-25 10:49 ` Richard Guy Briggs 2017-08-23 10:12 ` [PATCH V3 02/10] capabilities: intuitive names for cap gain status Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:03 ` Serge E. Hallyn 2017-08-24 16:03 ` Serge E. Hallyn 2017-08-24 16:19 ` Richard Guy Briggs 2017-08-24 16:19 ` Richard Guy Briggs 2017-08-24 16:37 ` Serge E. Hallyn 2017-08-24 16:37 ` Serge E. Hallyn 2017-08-24 19:06 ` Kees Cook 2017-08-24 19:06 ` Kees Cook 2017-08-24 21:17 ` Paul Moore 2017-08-24 21:17 ` Paul Moore 2017-08-28 9:19 ` Richard Guy Briggs 2017-08-28 9:19 ` Richard Guy Briggs 2017-08-28 11:08 ` Richard Guy Briggs 2017-08-28 11:08 ` Richard Guy Briggs 2017-09-01 10:18 ` Richard Guy Briggs 2017-09-01 10:18 ` Richard Guy Briggs 2017-09-02 5:37 ` Serge E. Hallyn 2017-09-02 5:37 ` Serge E. Hallyn 2017-09-04 6:57 ` Richard Guy Briggs 2017-09-04 6:57 ` Richard Guy Briggs 2017-09-05 6:45 ` Richard Guy Briggs 2017-09-05 6:45 ` Richard Guy Briggs 2017-08-25 5:56 ` James Morris 2017-08-25 5:56 ` James Morris 2017-08-25 15:08 ` Andy Lutomirski 2017-08-25 15:08 ` Andy Lutomirski 2017-08-25 18:47 ` Serge E. Hallyn 2017-08-25 18:47 ` Serge E. Hallyn 2017-08-23 10:12 ` [PATCH V3 03/10] capabilities: rename has_cap to has_fcap Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:10 ` Serge E. Hallyn 2017-08-24 16:10 ` Serge E. Hallyn 2017-08-25 5:56 ` James Morris 2017-08-25 5:56 ` James Morris 2017-08-23 10:12 ` [PATCH V3 04/10] capabilities: use root_priveleged inline to clarify logic Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:14 ` Serge E. Hallyn 2017-08-24 16:14 ` Serge E. Hallyn 2017-08-25 5:58 ` James Morris 2017-08-25 5:58 ` James Morris 2017-08-28 12:03 ` Richard Guy Briggs 2017-08-28 12:03 ` Richard Guy Briggs 2017-08-31 14:49 ` Serge E. Hallyn 2017-08-31 14:49 ` Serge E. Hallyn 2017-08-23 10:12 ` [PATCH V3 05/10] capabilities: use intuitive names for id changes Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:17 ` Serge E. Hallyn [this message] 2017-08-24 16:17 ` Serge E. Hallyn 2017-08-25 5:59 ` James Morris 2017-08-25 5:59 ` James Morris 2017-08-25 15:06 ` Andy Lutomirski 2017-08-25 15:06 ` Andy Lutomirski 2017-08-25 18:51 ` Serge E. Hallyn 2017-08-25 18:51 ` Serge E. Hallyn 2017-08-25 19:45 ` Andy Lutomirski 2017-08-25 19:45 ` Andy Lutomirski 2017-08-25 20:06 ` Serge E. Hallyn 2017-08-25 20:06 ` Serge E. Hallyn 2017-08-28 1:32 ` James Morris 2017-08-28 1:32 ` James Morris 2017-08-28 9:12 ` Richard Guy Briggs 2017-08-28 9:12 ` Richard Guy Briggs 2017-08-28 20:12 ` Andy Lutomirski 2017-08-28 20:12 ` Andy Lutomirski 2017-08-23 10:12 ` [PATCH V3 06/10] capabilities: move audit log decision to function Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:18 ` Serge E. Hallyn 2017-08-24 16:18 ` Serge E. Hallyn 2017-08-25 6:01 ` James Morris 2017-08-25 6:01 ` James Morris 2017-08-23 10:12 ` [PATCH V3 07/10] capabilities: remove a layer of conditional logic Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:20 ` Serge E. Hallyn 2017-08-24 16:20 ` Serge E. Hallyn 2017-08-25 5:47 ` James Morris 2017-08-25 5:47 ` James Morris 2017-08-25 15:11 ` Andy Lutomirski 2017-08-25 15:11 ` Andy Lutomirski 2017-08-25 18:53 ` Serge E. Hallyn 2017-08-25 18:53 ` Serge E. Hallyn 2017-08-23 10:12 ` [PATCH V3 08/10] capabilities: invert logic for clarity Richard Guy Briggs 2017-08-23 10:12 ` Richard Guy Briggs 2017-08-24 16:23 ` Serge E. Hallyn 2017-08-24 16:23 ` Serge E. Hallyn 2017-08-25 5:47 ` James Morris 2017-08-25 5:47 ` James Morris 2017-08-23 10:13 ` [PATCH V3 09/10] capabilities: fix logic for effective root or real root Richard Guy Briggs 2017-08-23 10:13 ` Richard Guy Briggs 2017-08-24 16:29 ` Serge E. Hallyn 2017-08-24 16:29 ` Serge E. Hallyn 2017-08-24 16:44 ` Richard Guy Briggs 2017-08-24 16:44 ` Richard Guy Briggs 2017-08-24 16:47 ` Serge E. Hallyn 2017-08-24 16:47 ` Serge E. Hallyn 2017-08-25 5:48 ` James Morris 2017-08-25 5:48 ` James Morris 2017-08-23 10:13 ` [PATCH V3 10/10] capabilities: audit log other surprising conditions Richard Guy Briggs 2017-08-23 10:13 ` Richard Guy Briggs 2017-08-24 16:35 ` Serge E. Hallyn 2017-08-24 16:35 ` Serge E. Hallyn 2017-08-25 5:50 ` James Morris 2017-08-25 5:50 ` 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=20170824161719.GE10515@mail.hallyn.com \ --to=serge@hallyn.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: linkBe 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.