Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 1f08c925e7a3 ("cachefiles: Implement backing file wrangling")
Cc: stable@kernel.org
Signed-off-by: Baokun Li <libaokun1@huawei.com>
Link: https://lore.kernel.org/r/20240829083409.3788142-1-libaokun@huaweicloud.com
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Baokun Li and committed by
Christian Brauner
da6ef2df 075dbe9f

+3 -4
+3 -4
fs/cachefiles/namei.c
··· 595 595 * write and readdir but not lookup or open). 596 596 */ 597 597 touch_atime(&file->f_path); 598 - dput(dentry); 599 598 return true; 600 599 601 600 check_failed: 602 601 fscache_cookie_lookup_negative(object->cookie); 603 602 cachefiles_unmark_inode_in_use(object, file); 604 603 fput(file); 605 - dput(dentry); 606 604 if (ret == -ESTALE) 607 605 return cachefiles_create_file(object); 608 606 return false; ··· 609 611 fput(file); 610 612 error: 611 613 cachefiles_do_unmark_inode_in_use(object, d_inode(dentry)); 612 - dput(dentry); 613 614 return false; 614 615 } 615 616 ··· 651 654 goto new_file; 652 655 } 653 656 654 - if (!cachefiles_open_file(object, dentry)) 657 + ret = cachefiles_open_file(object, dentry); 658 + dput(dentry); 659 + if (!ret) 655 660 return false; 656 661 657 662 _leave(" = t [%lu]", file_inode(object->file)->i_ino);