From 3eb98527fcecb3b74fba5145c62c4d8e3ef95d4e Mon Sep 17 00:00:00 2001 From: Rui Wang Date: Thu, 21 Jul 2016 13:21:39 -0700 Subject: [PATCH] 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 Reviewed-by: Konstantin Khlebnikov Signed-off-by: Miklos Szeredi Cc: Orabug: 24363418 CVE:CVE-2016-6198,CVE-2016-6197 Based on mainline v4.5 commit ce9113bbcbf45a57c082d6603b9a9f342be3ef74 Pre-req for mainline v4.6 commit 11f3710417d026ea2f4fcf362d866342c5274185 Conflicts: fs/overlayfs/dir.c - code base Signed-off-by: Chuck Anderson --- fs/overlayfs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.50.1