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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120516164323.GA15140@redhat.com>
Date:	Wed, 16 May 2012 18:43:24 +0200
From:	Oleg Nesterov <oleg@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Eric W. Biederman" <ebiederm@...ssion.com>
Subject: Re: linux-next: manual merge of the akpm with the  tree

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.

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