Skip to content

Commit

Permalink
ovl: fix getcwd() failure after unsuccessful rmdir
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ruiwang1 authored and szmi committed Mar 3, 2016
1 parent b5891cf commit ce9113b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/overlayfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ce9113b

Please sign in to comment.