Re: [PATCH 7/7][v8] SI_USER: Masquerade si_pid when crossing pid ns boundary

Eric W. Biederman
2009-02-19T22:18:40Z

Oleg Nesterov <oleg@redhat.com> writes:

> On 02/19, Eric W. Biederman wrote:
>>
>> Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> writes:
>>
>> > From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
>> > Date: Wed, 24 Dec 2008 14:14:18 -0800
>> > Subject: [PATCH 7/7][v8] SI_USER: Masquerade si_pid when crossing pid ns
>> > boundary
>> >
>> > When sending a signal to a descendant namespace, set ->si_pid to 0 since
>> > the sender does not have a pid in the receiver's namespace.
>> >
>> > Note:
>> > - If rt_sigqueueinfo() sets si_code to SI_USER when sending a
>> > signal across a pid namespace boundary, the value in ->si_pid
>> > will be cleared to 0.
>> >
>> > Changelog[v5]:
>> > - (Oleg Nesterov) Address both sys_kill() and sys_tkill() cases
>> > in send_signal() to simplify code (this drops patch 7/7 from
>> > earlier version of patchset).
>> >
>> > Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
>> > ---
>> > kernel/signal.c | 2 ++
>> > 1 files changed, 2 insertions(+), 0 deletions(-)
>> >
>> > diff --git a/kernel/signal.c b/kernel/signal.c
>> > index c94355b..a416d77 100644
>> > --- a/kernel/signal.c
>> > +++ b/kernel/signal.c
>> > @@ -883,6 +883,8 @@ static int __send_signal(int sig, struct siginfo *info,
>> > struct task_struct *t,
>> > break;
>> > default:
>> > copy_siginfo(&q->info, info);
>> > + if (from_ancestor_ns)
>> > + q->info.si_pid = 0;
>>
>> This is wrong. siginfo is a union and you need to inspect
>> code to see if si_pid is present in the current union.
>
> SI_FROMUSER() == T, unless we have more (hopefully not) in-kernel
> users which send SI_FROMUSER() signals, .si_pid must be valid?

So the argument is that while things such as force_sig_info(SIGSEGV)
don't have a si_pid we don't care because from_ancestor_ns == 0.

Interesting. Then I don't know if we have any kernel senders
that cross the namespace boundaries.

That said I still object to this code.

sys_kill(-pgrp, SIGUSR1)
kill_something_info(SIGUSR1, &info, 0)
__kill_pgrp_info(SIGUSR1, &info task_pgrp(current))
group_send_sig_info(SIGUSR1, &info, tsk)
__group_send_sig_info(SIGUSR1, &info, tsk)
send_signal(SIGUSR1, &info, tsk, 1)
__send_signal(SIGUSR1, &info, tsk, 1)

Process groups and sessions can have processes in multiple pid
namespaces, which is very useful for not messing up your controlling
terminal.

In which case sys_kill cannot possibly set the si_pid value correct
and from_ancestor_ns is not enough either.

So I see two valid policies with setting si_pid. Push the work
out to the callers of send_signal (kill_pgrp in this case). And
know you have a valid set of siginfo values. Or handle the work
in send_signal.

Given that except for process groups we don't send the same siginfo
to multiple processes simply generating the right siginfo values
from the start appears easy enough.

I am not current with the current rule: the caller of send_signal will
do all of the work except for sometimes. I don't see how we can figure
out which code path has the bug in it with a rule like that.

Eric