2021-10-13 08:43:12

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH] Bluetooth: Fix debugfs entry leak in hci_register_dev()

Fault injection test report debugfs entry leak as follows:

debugfs: Directory 'hci0' with parent 'bluetooth' already present!

When register_pm_notifier() failed in hci_register_dev(), the debugfs
create by debugfs_create_dir() do not removed in the error handing path.

Add the remove debugfs code to fix it.

Signed-off-by: Wei Yongjun <[email protected]>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 8a47a3017d61..cc48a8a9901c 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -3998,6 +3998,7 @@ int hci_register_dev(struct hci_dev *hdev)
return id;

err_wqueue:
+ debugfs_remove_recursive(hdev->debugfs);
destroy_workqueue(hdev->workqueue);
destroy_workqueue(hdev->req_workqueue);
err:
--
2.25.1


2021-10-13 09:12:26

by bluez.test.bot

[permalink] [raw]
Subject: RE: Bluetooth: Fix debugfs entry leak in hci_register_dev()

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=562483

---Test result---

Test Summary:
CheckPatch PASS 1.89 seconds
GitLint PASS 0.96 seconds
BuildKernel PASS 528.68 seconds
TestRunner: Setup PASS 412.56 seconds
TestRunner: l2cap-tester PASS 9.14 seconds
TestRunner: bnep-tester PASS 4.59 seconds
TestRunner: mgmt-tester PASS 84.08 seconds
TestRunner: rfcomm-tester PASS 5.58 seconds
TestRunner: sco-tester PASS 6.17 seconds
TestRunner: smp-tester PASS 5.86 seconds
TestRunner: userchan-tester PASS 4.89 seconds



---
Regards,
Linux Bluetooth


Attachments:
l2cap-tester.log (43.32 kB)
bnep-tester.log (3.48 kB)
mgmt-tester.log (630.87 kB)
rfcomm-tester.log (11.41 kB)
sco-tester.log (13.60 kB)
smp-tester.log (11.55 kB)
userchan-tester.log (6.22 kB)
Download all attachments

2021-10-13 12:30:26

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth: Fix debugfs entry leak in hci_register_dev()

Hi Wei,

> Fault injection test report debugfs entry leak as follows:
>
> debugfs: Directory 'hci0' with parent 'bluetooth' already present!
>
> When register_pm_notifier() failed in hci_register_dev(), the debugfs
> create by debugfs_create_dir() do not removed in the error handing path.
>
> Add the remove debugfs code to fix it.
>
> Signed-off-by: Wei Yongjun <[email protected]>

patch has been applied to bluetooth-next tree.

Regards

Marcel