linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20120516193052.4af4ee85feb4a36b936b74df@canb.auug.org.au>
Date:	Wed, 16 May 2012 19:30:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Oleg Nesterov <oleg@...hat.com>,
	"Eric W. Biederman" <ebiederm@...ssion.com>
Subject: linux-next: manual merge of the akpm with the  tree

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@...b.auug.org.au

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))

Content of type "application/pgp-signature" skipped