From: Rui Wang <rui.y.wang@intel.com>
Date: Fri, 8 Jan 2016 15:09:59 +0000 (+0800)
Subject: ovl: fix getcwd() failure after unsuccessful rmdir
X-Git-Tag: v4.1.12-92~150^2~136
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e61224e13b1def223ef932dddc6f2c7fafb0343a;p=users%2Fjedix%2Flinux-maple.git

ovl: fix getcwd() failure after unsuccessful rmdir

Orabug: 23330998

[ Upstream commit ce9113bbcbf45a57c082d6603b9a9f342be3ef74 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit e786702fff38e2b5142029d6de615abf1c8e436f)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 692ceda3bc21..36d6a5b3229f 100644
--- 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);
 	mutex_unlock(&dir->i_mutex);
 
 	return err;