From: Andy Lutomirski <luto@kernel.org> To: Kees Cook <keescook@chromium.org> Cc: Andrew Morton <akpm@linux-foundation.org>, Serge Hallyn <serge@hallyn.com>, Andy Lutomirski <luto@kernel.org>, David Howells <dhowells@redhat.com>, "Eric W. Biederman" <ebiederm@xmission.com>, John Johansen <john.johansen@canonical.com>, Paul Moore <paul@paul-moore.com>, Stephen Smalley <sds@tycho.nsa.gov>, Casey Schaufler <casey@schaufler-ca.com>, Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>, James Morris <james.l.morris@oracle.com>, Linus Torvalds <torvalds@linux-foundation.org>, Linux FS Devel <linux-fsdevel@vger.kernel.org>, LSM List <linux-security-module@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> Subject: Re: [PATCH v3 07/15] commoncap: Move cap_elevated calculation into bprm_set_creds Date: Tue, 18 Jul 2017 18:52:31 -0700 [thread overview] Message-ID: <CALCETrV1C_Q0XW=OENQpE=Wf_zOYzNqPHDZmK5D4ufx0EACvyQ@mail.gmail.com> (raw) In-Reply-To: <1500416736-49829-8-git-send-email-keescook@chromium.org> On Tue, Jul 18, 2017 at 3:25 PM, Kees Cook <keescook@chromium.org> wrote: > Instead of a separate function, open-code the cap_elevated test, which > lets us entirely remove bprm->cap_effective (to use the local "effective" > variable instead), and more accurately examine euid/egid changes via the > existing local "is_setid". ... > -static int is_secureexec(struct linux_binprm *bprm) > -{ > - const struct cred *cred = bprm->cred; > - kuid_t root_uid = make_kuid(cred->user_ns, 0); > - > - if (!uid_eq(cred->uid, root_uid)) { > - if (bprm->cap_effective) > - return 1; > - if (!cap_issubset(cred->cap_permitted, cred->cap_ambient)) > - return 1; > + bprm->cap_elevated = 0; > + if (is_setid) { > + bprm->cap_elevated = 1; > + } else if (!uid_eq(new->uid, root_uid)) { > + if (effective || > + !cap_issubset(new->cap_permitted, new->cap_ambient)) > + bprm->cap_elevated = 1; > } > > - return (!uid_eq(cred->euid, cred->uid) || > - !gid_eq(cred->egid, cred->gid)); > + return 0; I think this matches the old behavior. IOW it looks right.
WARNING: multiple messages have this Message-ID (diff)
From: luto@kernel.org (Andy Lutomirski) To: linux-security-module@vger.kernel.org Subject: [PATCH v3 07/15] commoncap: Move cap_elevated calculation into bprm_set_creds Date: Tue, 18 Jul 2017 18:52:31 -0700 [thread overview] Message-ID: <CALCETrV1C_Q0XW=OENQpE=Wf_zOYzNqPHDZmK5D4ufx0EACvyQ@mail.gmail.com> (raw) In-Reply-To: <1500416736-49829-8-git-send-email-keescook@chromium.org> On Tue, Jul 18, 2017 at 3:25 PM, Kees Cook <keescook@chromium.org> wrote: > Instead of a separate function, open-code the cap_elevated test, which > lets us entirely remove bprm->cap_effective (to use the local "effective" > variable instead), and more accurately examine euid/egid changes via the > existing local "is_setid". ... > -static int is_secureexec(struct linux_binprm *bprm) > -{ > - const struct cred *cred = bprm->cred; > - kuid_t root_uid = make_kuid(cred->user_ns, 0); > - > - if (!uid_eq(cred->uid, root_uid)) { > - if (bprm->cap_effective) > - return 1; > - if (!cap_issubset(cred->cap_permitted, cred->cap_ambient)) > - return 1; > + bprm->cap_elevated = 0; > + if (is_setid) { > + bprm->cap_elevated = 1; > + } else if (!uid_eq(new->uid, root_uid)) { > + if (effective || > + !cap_issubset(new->cap_permitted, new->cap_ambient)) > + bprm->cap_elevated = 1; > } > > - return (!uid_eq(cred->euid, cred->uid) || > - !gid_eq(cred->egid, cred->gid)); > + return 0; I think this matches the old behavior. IOW it looks right. -- 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
next prev parent reply other threads:[~2017-07-19 1:52 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-18 22:25 [PATCH v3 00/15] exec: Use sane stack rlimit under secureexec Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-18 22:25 ` [PATCH v3 01/15] binfmt: Introduce secureexec flag Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 0:05 ` John Johansen 2017-07-19 0:05 ` John Johansen 2017-07-19 1:01 ` Andy Lutomirski 2017-07-19 1:01 ` Andy Lutomirski 2017-07-18 22:25 ` [PATCH v3 02/15] exec: Rename bprm->cred_prepared to called_set_creds Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 0:08 ` John Johansen 2017-07-19 0:08 ` John Johansen 2017-07-19 1:06 ` Andy Lutomirski 2017-07-19 1:06 ` Andy Lutomirski 2017-07-19 4:40 ` Kees Cook 2017-07-19 4:40 ` Kees Cook 2017-07-19 9:19 ` James Morris 2017-07-19 9:19 ` James Morris 2017-07-19 23:56 ` Paul Moore 2017-07-19 23:56 ` Paul Moore 2017-07-18 22:25 ` [PATCH v3 03/15] apparmor: Refactor to remove bprm_secureexec hook Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 0:00 ` John Johansen 2017-07-19 0:00 ` John Johansen 2017-07-19 9:21 ` James Morris 2017-07-19 9:21 ` James Morris 2017-07-18 22:25 ` [PATCH v3 04/15] selinux: " Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-20 0:03 ` Paul Moore 2017-07-20 0:03 ` Paul Moore 2017-07-20 0:19 ` Paul Moore 2017-07-20 0:19 ` Paul Moore 2017-07-20 1:37 ` Kees Cook 2017-07-20 1:37 ` Kees Cook 2017-07-20 13:42 ` Paul Moore 2017-07-20 13:42 ` Paul Moore 2017-07-20 17:06 ` Kees Cook 2017-07-20 17:06 ` Kees Cook 2017-07-20 20:42 ` Paul Moore 2017-07-20 20:42 ` Paul Moore 2017-07-21 15:40 ` Paul Moore 2017-07-21 15:40 ` Paul Moore 2017-07-21 17:37 ` Kees Cook 2017-07-21 17:37 ` Kees Cook 2017-07-21 19:16 ` Paul Moore 2017-07-21 19:16 ` Paul Moore 2017-07-18 22:25 ` [PATCH v3 05/15] smack: " Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-26 3:58 ` Kees Cook 2017-07-26 3:58 ` Kees Cook 2017-07-26 15:24 ` Casey Schaufler 2017-07-26 15:24 ` Casey Schaufler 2017-07-18 22:25 ` [PATCH v3 06/15] commoncap: " Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 1:10 ` Andy Lutomirski 2017-07-19 1:10 ` Andy Lutomirski 2017-07-19 4:41 ` Kees Cook 2017-07-19 4:41 ` Kees Cook 2017-07-20 4:53 ` Andy Lutomirski 2017-07-20 4:53 ` Andy Lutomirski 2017-07-31 22:43 ` Kees Cook 2017-07-31 22:43 ` Kees Cook 2017-08-01 13:12 ` Andy Lutomirski 2017-08-01 13:12 ` Andy Lutomirski 2017-07-19 9:26 ` James Morris 2017-07-19 9:26 ` James Morris 2017-07-18 22:25 ` [PATCH v3 07/15] commoncap: Move cap_elevated calculation into bprm_set_creds Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 1:52 ` Andy Lutomirski [this message] 2017-07-19 1:52 ` Andy Lutomirski 2017-07-19 9:28 ` James Morris 2017-07-19 9:28 ` James Morris 2017-07-18 22:25 ` [PATCH v3 08/15] LSM: drop bprm_secureexec hook Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 0:02 ` John Johansen 2017-07-19 0:02 ` John Johansen 2017-07-19 9:29 ` James Morris 2017-07-19 9:29 ` James Morris 2017-07-18 22:25 ` [PATCH v3 09/15] exec: Correct comments about "point of no return" Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 0:45 ` Eric W. Biederman 2017-07-19 0:45 ` Eric W. Biederman 2017-07-18 22:25 ` [PATCH v3 10/15] exec: Use secureexec for setting dumpability Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-26 3:59 ` Kees Cook 2017-07-26 3:59 ` Kees Cook 2017-07-18 22:25 ` [PATCH v3 11/15] exec: Use secureexec for clearing pdeath_signal Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-18 22:25 ` [PATCH v3 12/15] smack: Remove redundant pdeath_signal clearing Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-18 22:25 ` [PATCH v3 13/15] exec: Consolidate dumpability logic Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-18 22:25 ` [PATCH v3 14/15] exec: Use sane stack rlimit under secureexec Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-19 9:42 ` James Morris 2017-07-19 9:42 ` James Morris 2017-07-18 22:25 ` [PATCH v3 15/15] exec: Consolidate pdeath_signal clearing Kees Cook 2017-07-18 22:25 ` Kees Cook 2017-07-18 23:03 ` [PATCH v3 00/15] exec: Use sane stack rlimit under secureexec Linus Torvalds 2017-07-18 23:03 ` Linus Torvalds 2017-07-19 3:22 ` Serge E. Hallyn 2017-07-19 3:22 ` Serge E. Hallyn 2017-07-19 5:23 ` Kees Cook 2017-07-19 5:23 ` Kees Cook
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='CALCETrV1C_Q0XW=OENQpE=Wf_zOYzNqPHDZmK5D4ufx0EACvyQ@mail.gmail.com' \ --to=luto@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=casey@schaufler-ca.com \ --cc=dhowells@redhat.com \ --cc=ebiederm@xmission.com \ --cc=james.l.morris@oracle.com \ --cc=john.johansen@canonical.com \ --cc=keescook@chromium.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=paul@paul-moore.com \ --cc=penguin-kernel@i-love.sakura.ne.jp \ --cc=sds@tycho.nsa.gov \ --cc=serge@hallyn.com \ --cc=torvalds@linux-foundation.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.