Bluetooth: btnxpuart: unregister HCI device on probe failure
Subsystems (2)
PATCH 1/1 Bluetooth: btnxpuart: unregister HCI device on probe failure
If hci_register_dev() succeeds but ps_setup() fails, nxp_serdev_probe() jumps to probe_fail and frees the HCI device without first unregistering it. The remove path unregisters the HCI device before freeing it, and the probe error path needs the same ordering once registration has succeeded.
Send failures after successful registration through a new label that calls hci_unregister_dev(), then fall through to the existing reset and free cleanup. Keep hci_register_dev() failures on the original path because the device was not registered in that case.
--- drivers/bluetooth/btnxpuart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bluetooth/btnxpuart.c +3 -1
@@ -1907,13 +1907,15 @@ static int nxp_serdev_probe(struct serdev_device *serdev) }if (ps_setup (hdev)) - goto probe_fail; + goto unregister_dev;hci_devcd_register (hdev, nxp_coredump, nxp_coredump_hdr, nxp_coredump_notify);return 0 ; +unregister_dev: +hci_unregister_dev (hdev); probe_fail:reset_control_assert (nxpdev->pdn);hci_free_dev (hdev);
Signature · 1 line
2.53.0
Neeraj Sanjay Kale
maintainerPATCH 1/1 Bluetooth: btnxpuart: unregister HCI device on probe failure
Hi Myeonghun,
Thank you for submitting this patch.
However, a similar patch is already in review and approved by me:
https://patchwork.kernel.org/project/bluetooth/patch/[email protected]/
It's awaiting Luiz's review and/or merge.
Hi Luiz,
Can you please review the patch mentioned in the URL above, from Zhao Dongdong? I have answered your review comment. Thank you for your time and review.
Thanks,
Neeraj
Quoted 43 lines
If
hci_register_dev()succeeds butps_setup()fails,nxp_serdev_probe()jumps toprobe_failand frees the HCI device without first unregistering it. The remove path unregisters the HCI device before freeing it, and the probe error path needs the same ordering once registration has succeeded.Send failures after successful registration through a new label that calls
hci_unregister_dev(), then fall through to the existing reset and free cleanup. Keephci_register_dev()failures on the original path because the device was not registered in that case.Fixes 689ca16e5232 ("Bluetooth: NXP: Add protocol support for NXPBluetooth chipsets")
Co-developed-by Ijae Kim <[email protected]>Signed-off-by Ijae Kim <[email protected]>Signed-off-by Myeonghun Pak <[email protected]>--- drivers/bluetooth/btnxpuart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/bluetooth/btnxpuart.c +3
-1@@ -1907,13 +1907,15 @@ static int nxp_serdev_probe(struct serdev_device *serdev) }if (ps_setup (hdev)) - goto probe_fail; + goto unregister_dev;hci_devcd_register (hdev, nxp_coredump, nxp_coredump_hdr, nxp_coredump_notify);return 0 ; +unregister_dev: +hci_unregister_dev (hdev); probe_fail:reset_control_assert (nxpdev->pdn);hci_free_dev(hdev);--
2.53.0
Hi Neeraj,
Thank you for checking and for pointing me to Zhao's patch.
I missed that pending review. Please ignore my patch; I will defer to the existing patch from Zhao Dongdong.
Sorry for the noise.
Best regards,
Myeonghun
2026년 6월 26일 (금) 오후 6:07, Neeraj Sanjay Kale <[email protected]>님이 작성:
Quoted 63 lines
Hi Myeonghun,
Thank you for submitting this patch.
However, a similar patch is already in review and approved by me:
https://patchwork.kernel.org/project/bluetooth/patch/[email protected]/
It's awaiting Luiz's review and/or merge.Hi Luiz,
Can you please review the patch mentioned in the URL above, from Zhao Dongdong? I have answered your review comment. Thank you for your time and review.
Thanks,
NeerajQuoted 43 lines
If
hci_register_dev()succeeds butps_setup()fails,nxp_serdev_probe()jumps toprobe_failand frees the HCI device without first unregistering it. The remove path unregisters the HCI device before freeing it, and the probe error path needs the same ordering once registration has succeeded.Send failures after successful registration through a new label that calls
hci_unregister_dev(), then fall through to the existing reset and free cleanup. Keephci_register_dev()failures on the original path because the device was not registered in that case.Fixes 689ca16e5232 ("Bluetooth: NXP: Add protocol support for NXPBluetooth chipsets")
Co-developed-by Ijae Kim <[email protected]>Signed-off-by Ijae Kim <[email protected]>Signed-off-by Myeonghun Pak <[email protected]>--- drivers/bluetooth/btnxpuart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/bluetooth/btnxpuart.c +3
-1@@ -1907,13 +1907,15 @@ static int nxp_serdev_probe(struct serdev_device *serdev) }if (ps_setup (hdev)) - goto probe_fail; + goto unregister_dev;hci_devcd_register (hdev, nxp_coredump, nxp_coredump_hdr, nxp_coredump_notify);return 0 ; +unregister_dev: +hci_unregister_dev (hdev); probe_fail:reset_control_assert (nxpdev->pdn);hci_free_dev(hdev);--
2.53.0
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=1116973
---Test result---
Test Summary:
CheckPatch PASS 1.06 seconds VerifyFixes PASS 0.32 seconds VerifySignedoff PASS 0.26 seconds GitLint PASS 0.69 seconds SubjectPrefix PASS 0.26 seconds BuildKernel PASS 27.29 seconds CheckAllWarning PASS 30.10 seconds CheckSparse PASS 29.16 seconds BuildKernel32 PASS 26.36 seconds CheckKernelLLVM SKIP 0.00 seconds TestRunnerSetup PASS 503.86 seconds IncrementalBuild PASS 26.49 seconds
Details
##############################
Test: CheckKernelLLVM - SKIP
Desc: Build kernel with LLVM + context analysis
Output:
Clang not found
https://github.com/bluez/bluetooth-next/pull/355
---
Regards,
Linux Bluetooth