Subject: Re: linux-next: manual merge of the akpm with the tree

From: [email-masked] (Eric W. Biederman)
Date: Thu, 17 May 2012 11:28:08 -0600

Oleg Nesterov <[email-masked]> writes:

> On 05/16, Stephen Rothwell wrote:
>>
>> --- 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;
>
> Thanks Stephen, the fix looks correct.
>
> Oleg.

Yes.  That looks good.

I'm not quite certain of my thinking there was.  The two idioms are
equivalent.  I suspect I confused task_uid(p) which is fine with
task_user_ns(p) which is only safe under the rtnl lock and should
probably be removed as a helper function because it isn't used that way.

Eric