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 <[email protected]> Reviewed-by: Konstantin Khlebnikov <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]> Cc: <[email protected]>
jbg · Mar 3, 2016 · ce9113b · ce9113b
1 parent b5891cf
commit ce9113b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
@@ -618,7 +618,8 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
 	 * sole user of this dentry.  Too tricky...  Just unhash for
 	 * now.
 	 */
-	d_drop(dentry);
+	if (!err)
+		d_drop(dentry);
 	inode_unlock(dir);
 
 	return err;