summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRui Wang <rui.y.wang@intel.com>2016-01-08 23:09:59 +0800
committerMiklos Szeredi <miklos@szeredi.hu>2016-03-03 17:17:45 +0100
commitce9113bbcbf45a57c082d6603b9a9f342be3ef74 (patch)
tree180a7f5fa4eef7bcd051bae41c877c72b7eb8d18 /fs
parentb5891cfab08fe3144a616e8e734df7749fb3b7d0 (diff)
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>
Diffstat (limited to 'fs')
-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 ed95272d57a6..795ab65ccdf5 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);
inode_unlock(dir);
return err;