summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Wang <rui.y.wang@intel.com>2016-01-08 23:09:59 +0800
committerSasha Levin <sasha.levin@oracle.com>2016-03-22 11:10:26 -0400
commite786702fff38e2b5142029d6de615abf1c8e436f (patch)
tree515bbba6549b97a03cb05d458fbcf1b84b18ae4f
parent7ce08a0c9992da8986b06154a768646e41012469 (diff)
ovl: fix getcwd() failure after unsuccessful rmdir
[ 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>
-rw-r--r--fs/overlayfs/dir.c3
1 files changed, 2 insertions, 1 deletions
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;