summaryrefslogtreecommitdiffstats
path: root/fs/exportfs
diff options
context:
space:
mode:
authorPan Bian2018-11-23 08:56:33 +0100
committerGreg Kroah-Hartman2018-12-17 09:24:35 +0100
commitad374d10b78e3af930119d9b381e9578c41d986f (patch)
treec58b4bf8c53b2c6c1dd7d529a63b2677976c0fd6 /fs/exportfs
parentASoC: omap-dmic: Add pm_qos handling to avoid overruns with CPU_IDLE (diff)
downloadkernel-qcow2-linux-ad374d10b78e3af930119d9b381e9578c41d986f.tar.gz
kernel-qcow2-linux-ad374d10b78e3af930119d9b381e9578c41d986f.tar.xz
kernel-qcow2-linux-ad374d10b78e3af930119d9b381e9578c41d986f.zip
exportfs: do not read dentry after free
[ Upstream commit 2084ac6c505a58f7efdec13eba633c6aaa085ca5 ] The function dentry_connected calls dput(dentry) to drop the previously acquired reference to dentry. In this case, dentry can be released. After that, IS_ROOT(dentry) checks the condition (dentry == dentry->d_parent), which may result in a use-after-free bug. This patch directly compares dentry with its parent obtained before dropping the reference. Fixes: a056cc8934c("exportfs: stop retrying once we race with rename/remove") Signed-off-by: Pan Bian <bianpan2016@163.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/exportfs')
-rw-r--r--fs/exportfs/expfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index 645158dc33f1..63707abcbeb3 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -77,7 +77,7 @@ static bool dentry_connected(struct dentry *dentry)
struct dentry *parent = dget_parent(dentry);
dput(dentry);
- if (IS_ROOT(dentry)) {
+ if (dentry == parent) {
dput(parent);
return false;
}