From: ebiederm@xmission.com (Eric W. Biederman)
To: "Serge E. Hallyn" <serge@hallyn.com>
Cc: LSM <linux-security-module@vger.kernel.org>,
James Morris <jmorris@namei.org>,
Kees Cook <kees.cook@canonical.com>,
containers@lists.linux-foundation.org,
kernel list <linux-kernel@vger.kernel.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
Michael Kerrisk <michael.kerrisk@gmail.com>
Subject: Re: [RFC 4/5] user namespaces: allow killing tasks in your own or child userns
Date: Fri, 17 Dec 2010 11:31:40 -0800 [thread overview]
Message-ID: <m14oacryar.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <20101217152659.GD11162@mail.hallyn.com> (Serge E. Hallyn's message of "Fri, 17 Dec 2010 15:26:59 +0000")
"Serge E. Hallyn" <serge@hallyn.com> writes:
> Changelog:
> Dec 8: Fixed bug in my check_kill_permission pointed out by
> Eric Biederman.
> Dec 13: Apply Eric's suggestion to pass target task into kill_ok_by_cred()
> for clarity
>
> Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
> ---
> kernel/signal.c | 33 ++++++++++++++++++++++++++++-----
> 1 files changed, 28 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/signal.c b/kernel/signal.c
> index 4e3cff1..499bd36 100644
> --- a/kernel/signal.c
> +++ b/kernel/signal.c
> @@ -659,11 +686,7 @@ static int check_kill_permission(int sig, struct siginfo *info,
> cred = current_cred();
> tcred = __task_cred(t);
Nit pick you don't need to compute cred and tcred here now.
> if (!same_thread_group(current, t) &&
> - (cred->euid ^ tcred->suid) &&
> - (cred->euid ^ tcred->uid) &&
> - (cred->uid ^ tcred->suid) &&
> - (cred->uid ^ tcred->uid) &&
> - !capable(CAP_KILL)) {
> + !kill_ok_by_cred(t)) {
> switch (sig) {
> case SIGCONT:
> sid = task_session(t);
next prev parent reply other threads:[~2010-12-17 19:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 15:22 [RFC 0/5] user namespaces: start clamping down Serge E. Hallyn
2010-12-17 15:24 ` [RFC 1/5] user namespaces: Add a user_namespace as creator/owner of uts_namespace Serge E. Hallyn
2010-12-17 15:25 ` [RFC 2/5] user namespaces: make capabilities relative to the user namespace Serge E. Hallyn
2010-12-17 15:26 ` [RFC 3/5] user namespaces: allow sethostname in a container Serge E. Hallyn
2010-12-17 15:26 ` [RFC 4/5] user namespaces: allow killing tasks in your own or child userns Serge E. Hallyn
2010-12-17 15:27 ` [RFC 5/5] user namespaces: Allow ptrace from non-init user namespaces Serge E. Hallyn
2010-12-17 19:45 ` Eric W. Biederman
2010-12-17 20:04 ` Serge Hallyn
2011-01-01 4:47 ` Serge E. Hallyn
2010-12-17 19:31 ` Eric W. Biederman [this message]
2010-12-17 20:09 ` [RFC 4/5] user namespaces: allow killing tasks in your own or child userns Serge E. Hallyn
2010-12-17 20:17 ` Eric W. Biederman
2010-12-17 20:22 ` Serge E. Hallyn
2011-01-01 4:45 ` Serge E. Hallyn
2011-01-01 23:10 ` Eric W. Biederman
2011-01-02 14:39 ` Serge E. Hallyn
2010-12-17 15:56 ` [RFC 1/5] user namespaces: Add a user_namespace as creator/owner of uts_namespace Alexey Dobriyan
2010-12-17 16:00 ` Alexey Dobriyan
2010-12-17 16:17 ` Serge Hallyn
2010-12-17 16:12 ` Serge Hallyn
2010-12-17 17:31 ` Greg KH
2010-12-17 19:26 ` Eric W. Biederman
2010-12-17 19:58 ` Greg KH
2010-12-17 20:40 ` Eric W. Biederman
2010-12-17 23:15 ` Greg KH
2010-12-18 6:32 ` Eric W. Biederman
2010-12-18 17:56 ` Greg KH
2010-12-17 19:46 ` Serge Hallyn
2010-12-17 19:57 ` Greg KH
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=m14oacryar.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=adobriyan@gmail.com \
--cc=containers@lists.linux-foundation.org \
--cc=jmorris@namei.org \
--cc=kees.cook@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=michael.kerrisk@gmail.com \
--cc=serge@hallyn.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox