android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fuse: readdirplus: fix dentry leak

Browse Source 
In case d_lookup() returns a dentry with d_inode == NULL, the dentry is not
returned with dput(). This results in triggering a BUG() in
shrink_dcache_for_umount_subtree():

  BUG: Dentry ...{i=0,n=...} still in use (1) [unmount of fuse fuse]

[SzM: need to d_drop() as well]

Reported-by: Justin Clift <jclift@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Brian Foster <bfoster@redhat.com>
Tested-by: Niels de Vos <ndevos@redhat.com>
CC: stable@vger.kernel.org
This commit is contained in:
Niels de Vos 2013-07-17 14:53:53 +02:00 committed by Miklos Szeredi
parent ad81f0545e
commit 53ce9a3364
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/fuse/dir.c
View File

@ -1227,9 +1227,15 @@ static int fuse_direntplus_link(struct file *file,
name.hash = full_name_hash(name.name, name.len); name.hash = full_name_hash(name.name, name.len);
dentry = d_lookup(parent, &name); dentry = d_lookup(parent, &name);
if (dentry && dentry->d_inode) { if (dentry) {
inode = dentry->d_inode; inode = dentry->d_inode;
if (get_node_id(inode) == o->nodeid) { if (!inode) {
d_drop(dentry);
} else if (get_node_id(inode) != o->nodeid) {
err = d_invalidate(dentry);
if (err)
goto out;
} else {
struct fuse_inode *fi; struct fuse_inode *fi;
fi = get_fuse_inode(inode); fi = get_fuse_inode(inode);
spin_lock(&fc->lock); spin_lock(&fc->lock);
@ -1242,9 +1248,6 @@ static int fuse_direntplus_link(struct file *file,
*/ */
goto found; goto found;
} }
err = d_invalidate(dentry);
if (err)
goto out;
dput(dentry); dput(dentry);
dentry = NULL; dentry = NULL;
} }