Skip to content

Commit da6ef2d

Browse files
LiBaokun96brauner
authored andcommitted
cachefiles: fix dentry leak in cachefiles_open_file()
A dentry leak may be caused when a lookup cookie and a cull are concurrent: P1 | P2 ----------------------------------------------------------- cachefiles_lookup_cookie cachefiles_look_up_object lookup_one_positive_unlocked // get dentry cachefiles_cull inode->i_flags |= S_KERNEL_FILE; cachefiles_open_file cachefiles_mark_inode_in_use __cachefiles_mark_inode_in_use can_use = false if (!(inode->i_flags & S_KERNEL_FILE)) can_use = true return false return false // Returns an error but doesn't put dentry After that the following WARNING will be triggered when the backend folder is umounted: ================================================================== BUG: Dentry 000000008ad87947{i=7a,n=Dx_1_1.img} still in use (1) [unmount of ext4 sda] WARNING: CPU: 4 PID: 359261 at fs/dcache.c:1767 umount_check+0x5d/0x70 CPU: 4 PID: 359261 Comm: umount Not tainted 6.6.0-dirty #25 RIP: 0010:umount_check+0x5d/0x70 Call Trace: <TASK> d_walk+0xda/0x2b0 do_one_tree+0x20/0x40 shrink_dcache_for_umount+0x2c/0x90 generic_shutdown_super+0x20/0x160 kill_block_super+0x1a/0x40 ext4_kill_sb+0x22/0x40 deactivate_locked_super+0x35/0x80 cleanup_mnt+0x104/0x160 ================================================================== Whether cachefiles_open_file() returns true or false, the reference count obtained by lookup_positive_unlocked() in cachefiles_look_up_object() should be released. Therefore release that reference count in cachefiles_look_up_object() to fix the above issue and simplify the code. Fixes: 1f08c92 ("cachefiles: Implement backing file wrangling") Cc: [email protected] Signed-off-by: Baokun Li <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: David Howells <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 075dbe9 commit da6ef2d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

fs/cachefiles/namei.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -595,14 +595,12 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
595595
* write and readdir but not lookup or open).
596596
*/
597597
touch_atime(&file->f_path);
598-
dput(dentry);
599598
return true;
600599

601600
check_failed:
602601
fscache_cookie_lookup_negative(object->cookie);
603602
cachefiles_unmark_inode_in_use(object, file);
604603
fput(file);
605-
dput(dentry);
606604
if (ret == -ESTALE)
607605
return cachefiles_create_file(object);
608606
return false;
@@ -611,7 +609,6 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
611609
fput(file);
612610
error:
613611
cachefiles_do_unmark_inode_in_use(object, d_inode(dentry));
614-
dput(dentry);
615612
return false;
616613
}
617614

@@ -654,7 +651,9 @@ bool cachefiles_look_up_object(struct cachefiles_object *object)
654651
goto new_file;
655652
}
656653

657-
if (!cachefiles_open_file(object, dentry))
654+
ret = cachefiles_open_file(object, dentry);
655+
dput(dentry);
656+
if (!ret)
658657
return false;
659658

660659
_leave(" = t [%lu]", file_inode(object->file)->i_ino);

0 commit comments

Comments
 (0)