diff options
| author | Rui Wang <rui.y.wang@intel.com> | 2016-01-08 23:09:59 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-22 11:11:09 -0400 |
| commit | c190fea9a4f9669b424b6cbacc8b463574dd754f (patch) | |
| tree | 099606eaa2ad6785b01510df43b63b75ed9ede31 | |
| parent | 1c767580d56097105f1e45bc9b71582599ea5638 (diff) | |
| download | lwn-c190fea9a4f9669b424b6cbacc8b463574dd754f.tar.gz lwn-c190fea9a4f9669b424b6cbacc8b463574dd754f.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index 8ffc4b980f1b..ddb1dc97859e 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -595,7 +595,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; |