Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
kernel/signal.c between commit 54ba47edac90 ("userns: signal remove
unnecessary map_cred_ns") from the userns tree and commit "pidns: use
task_active_pid_ns in do_notify_parent" from the akpm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc kernel/signal.c
index c5100ad,d9bcff9..0000000
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@@ -1668,9 -1677,9 +1667,9 @@@ bool do_notify_parent(struct task_struc
* correct to rely on this
*/
rcu_read_lock();
- info.si_pid = task_pid_nr_ns(tsk, tsk->parent->nsproxy->pid_ns);
+ info.si_pid = task_pid_nr_ns(tsk, task_active_pid_ns(tsk->parent));
- info.si_uid = map_cred_ns(__task_cred(tsk),
- task_cred_xxx(tsk->parent, user_ns));
+ info.si_uid = from_kuid_munged(task_cred_xxx(tsk->parent, user_ns),
+ task_uid(tsk));
rcu_read_unlock();
info.si_utime = cputime_to_clock_t(tsk->utime + tsk->signal->utime);
Attachment:
pgpvHcCST8HpI.pgp
Description: PGP signature
