linux-kernel - linux-next: manual merge of the akpm tree with the userns 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: <20121127001320.12439806f19c9b6ccce4e895@canb.auug.org.au>
Date:	Tue, 27 Nov 2012 00:13:20 +1100
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,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	Alan Cox <alan@...ux.intel.com>
Subject: linux-next: manual merge of the akpm tree with the userns tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in kernel/fork.c
between commit b2e0d98705e6 ("userns: Implement unshare of the user
namespace") from the userns tree and commit  ("fork: unshare: remove dead
cod") from the akpm tree.

I fixed it up (I think - see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc kernel/fork.c
index 7e0dc2f,58088f9..0000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -1867,20 -1858,8 +1865,17 @@@ SYSCALL_DEFINE1(unshare, unsigned long
  		}
  
  		task_unlock(current);
 +
 +		if (new_cred) {
 +			/* Install the new user namespace */
 +			commit_creds(new_cred);
 +			new_cred = NULL;
 +		}
  	}
  
- 	if (new_nsproxy)
- 		put_nsproxy(new_nsproxy);
- 
 +bad_unshare_cleanup_cred:
 +	if (new_cred)
 +		put_cred(new_cred);
  bad_unshare_cleanup_fd:
  	if (new_fd)
  		put_files_struct(new_fd);

Content of type "application/pgp-signature" skipped