Skip to content

Commit 351ea48

Browse files
author
Al Viro
committed
rust_binderfs: fix a dentry leak
Parallel to binderfs patches - 02da8d2 "binderfs_binder_ctl_create(): kill a bogus check" and the bit of b89aa54 "convert binderfs" that got lost when making 4433d8e "convert rust_binderfs"; the former is a cleanup, the latter is about marking /binder-control persistent, so that it would be taken out on umount. Fixes: 4433d8e ("convert rust_binderfs") Acked-by: Alice Ryhl <[email protected]> Acked-by: Christian Brauner <[email protected]> Signed-off-by: Al Viro <[email protected]>
1 parent 63804fe commit 351ea48

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

drivers/android/binder/rust_binderfs.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -391,12 +391,6 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
391391
if (!device)
392392
return -ENOMEM;
393393

394-
/* If we have already created a binder-control node, return. */
395-
if (info->control_dentry) {
396-
ret = 0;
397-
goto out;
398-
}
399-
400394
ret = -ENOMEM;
401395
inode = new_inode(sb);
402396
if (!inode)
@@ -431,7 +425,8 @@ static int binderfs_binder_ctl_create(struct super_block *sb)
431425

432426
inode->i_private = device;
433427
info->control_dentry = dentry;
434-
d_add(dentry, inode);
428+
d_make_persistent(dentry, inode);
429+
dput(dentry);
435430

436431
return 0;
437432

0 commit comments

Comments
 (0)