Re: [RFC 4/5] user namespaces: allow killing tasks in your own or child userns

From: Eric W. Biederman
Date: Fri Dec 17 2010 - 15:18:10 EST


"Serge E. Hallyn" <serge@xxxxxxxxxx> writes:

> Quoting Eric W. Biederman (ebiederm@xxxxxxxxxxxx):
>> > --- 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.
>
> Just to make sure I understand right: you mean wait until after the
> same_thread_group() check to save calculation in that case, right?

I mean cred and tcred are only use in kill_ok_by_cred.
So we can eliminate those two variables from check_kill_permission.

>> > 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);


Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/