linux-kernel - linux-next: manual merge of 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: <20131019121548.GX2443@sirena.org.uk>
Date:	Sat, 19 Oct 2013 13:15:48 +0100
From:	Mark Brown <broonie@...nel.org>
To:	"Eric W. Biederman" <ebiederman@...tter.com>,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	Miklos Szeredi <mszeredi@...e.cz>,
	Miklos Szeredi <miklos@...redi.hu>
Cc:	Thierry Reding <thierry.reding@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the userns tree

Today's linux-next merge of the userns tree got a conflict in
fs/fuse/dir.c between 3c70b8eed (fuse: don't check_submounts_and_drop()
in RCU walk) in the fuse tree and 40216baa0 (vfs: Lazily remove mounts
on unlinked files and directories. v2) in the userns tree.

I fixed it up as below and can carry as required:

diff --cc fs/fuse/dir.c
index 0747f6e,b1cd7b7..0000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -263,9 -259,7 +263,10 @@@ out
  
  invalid:
  	ret = 0;
 -	shrink_submounts_and_drop(entry);
 +
- 	if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
- 		ret = 1;
++	if (!(flags & LOOKUP_RCU))
++		shrink_submounts_and_drop(entry);
++
  	goto out;
  }
  

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)