| Message ID | 20191130020225.20239-4-yukuai3@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V2,1/3] dcache: add a new enum type for 'dentry_d_lock_class' | expand |
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 7b975dbb2bb4..d5ef7a0a4410 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -773,8 +773,11 @@ void debugfs_remove_recursive(struct dentry *dentry) if (!simple_positive(child)) continue; - /* perhaps simple_empty(child) makes more sense */ - if (!list_empty(&child->d_subdirs)) { + /* + * use simple_empty to prevent infinite loop when any + * subdentry of child is in use + */ + if (!simple_empty(child)) { spin_unlock(&parent->d_lock); inode_unlock(d_inode(parent)); parent = child;
debugfs_remove_recursive uses list_empty to judge weather a dentry has any subdentry or not. This can lead to infinite loop when any subdir is in use. The problem was discoverd by the following steps in the console. 1. use debugfs_create_dir to create a dir and multiple subdirs(insmod); 2. cd to the subdir with depth not less than 2; 3. call debugfs_remove_recursive(rmmod). After removing the subdir, the infinite loop is triggered because debugfs_remove_recursive uses list_empty to judge if the current dir doesn't have any subdentry. However list_empty can't skip the subdentry that is not simple_positive(simple_positive() will return false). Fix the problem by using simple_empty instead of list_empty. Fixes: 776164c1faac ('debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)') Reported-by: chenxiang66@hisilicon.com Signed-off-by: yu kuai <yukuai3@huawei.com> --- fs/debugfs/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)