Commit ce9113bb authored Jan 08, 2016 by Rui Wang Committed by Miklos Szeredi Mar 03, 2016

ovl: fix getcwd() failure after unsuccessful rmdir

ovl_remove_upper() should do d_drop() only after it successfully
removes the dir, otherwise a subsequent getcwd() system call will
fail, breaking userspace programs.

This is to fix: https://bugzilla.kernel.org/show_bug.cgi?id=110491



Signed-off-by: Rui Wang <rui.y.wang@intel.com>
Reviewed-by: Konstantin Khlebnikov <koct9i@gmail.com>
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Cc: <stable@vger.kernel.org>

parent b5891cfa

fs/overlayfs/dir.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -618,6 +618,7 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
		* sole user of this dentry. Too tricky... Just unhash for
		* now.
		*/
		if (!err)
		d_drop(dentry);
		inode_unlock(dir);