[v2] Bluetooth: hci_core: fix error handling in hci_register_dev()

Commit Message

Yang Yingliang Oct. 19, 2022, 8:06 a.m. UTC

If hci_register_suspend_notifier() returns error, the hdev
need to be put and deleted and rfkill need be unregistered
and destroyed to avoid leaks.

Fixes: 9952d90ea288 ("Bluetooth: Handle PM_SUSPEND_PREPARE and PM_POST_SUSPEND")
Signed-off-by: Yang Yingliang <[e-mail]>
---
v1 -> v2:
  Add rfkill_destroy().
---
 net/bluetooth/hci_core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

[e-mail] Oct. 19, 2022, 9:27 a.m. UTC | #1

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=686590

---Test result---

Test Summary:
CheckPatch                    PASS      1.73 seconds
GitLint                       PASS      1.02 seconds
SubjectPrefix                 PASS      0.84 seconds
BuildKernel                   PASS      33.97 seconds
BuildKernel32                 PASS      29.79 seconds
Incremental Build with patchesPASS      43.47 seconds
TestRunner: Setup             PASS      502.40 seconds
TestRunner: l2cap-tester      PASS      17.18 seconds
TestRunner: iso-tester        PASS      15.97 seconds
TestRunner: bnep-tester       PASS      6.35 seconds
TestRunner: mgmt-tester       PASS      102.59 seconds
TestRunner: rfcomm-tester     PASS      10.10 seconds
TestRunner: sco-tester        PASS      9.52 seconds
TestRunner: ioctl-tester      PASS      10.69 seconds
TestRunner: mesh-tester       PASS      7.66 seconds
TestRunner: smp-tester        PASS      9.45 seconds
TestRunner: userchan-tester   PASS      6.48 seconds



---
Regards,
Linux Bluetooth

Patch

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 0540555b3704..a6222238de7f 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2660,7 +2660,7 @@  int hci_register_dev(struct hci_dev *hdev)
 
 	error = hci_register_suspend_notifier(hdev);
 	if (error)
-		goto err_wqueue;
+		goto err_hdev;
 
 	queue_work(hdev->req_workqueue, &hdev->power_on);
 
@@ -2669,6 +2669,14 @@  int hci_register_dev(struct hci_dev *hdev)
 
 	return id;
 
+err_hdev:
+	hci_dev_put(hdev);
+	if (hdev->rfkill) {
+		rfkill_unregister(hdev->rfkill);
+		rfkill_destroy(hdev->rfkill);
+		hdev->rfkill = NULL;
+	}
+	device_del(&hdev->dev);
 err_wqueue:
 	debugfs_remove_recursive(hdev->debugfs);
 	destroy_workqueue(hdev->workqueue);