Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in kernel/exit.c
between commit a29c33f4e506 ("userns: Convert setting and getting uid and
gid system calls to use kuid and kgid") from the uerns tree and commit
"cred: remove task_is_dead() from __task_cred() validation" from the akpm
tree.
I fixed it up (I think - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc kernel/exit.c
index 112f703,7c293e6..0000000
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@@ -1218,7 -1218,7 +1218,7 @@@ static int wait_task_zombie(struct wait
unsigned long state;
int retval, status, traced;
pid_t pid = task_pid_vnr(p);
- uid_t uid = from_kuid_munged(current_user_ns(), __task_cred(p)->uid);
- uid_t uid = task_uid(p);
++ uid_t uid = from_kuid_munged(current_user_ns(), task_uid(p));
struct siginfo __user *infop;
if (!likely(wo->wo_flags & WEXITED))
Attachment:
pgpIZiXuif28T.pgp
Description: PGP signature
