Bluetooth: Fix possible infinite recursion of btusb_reset

Commit Message

Hsin-chen Chuang Jan. 20, 2025, 10:39 a.m. UTC

From: Hsin-chen Chuang <[e-mail]>

The function enters infinite recursion if the HCI device doesn't support
GPIO reset: btusb_reset -> hdev->reset -> vendor_reset -> btusb_reset...

btusb_reset shouldn't call hdev->reset after commit f07d478090b0
("Bluetooth: Get rid of cmd_timeout and use the reset callback")

Fixes: f07d478090b0 ("Bluetooth: Get rid of cmd_timeout and use the reset callback")
Signed-off-by: Hsin-chen Chuang <[e-mail]>
---

 drivers/bluetooth/btusb.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

[e-mail] Jan. 20, 2025, 11:29 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=926902

---Test result---

Test Summary:
CheckPatch                    PENDING   0.28 seconds
GitLint                       PENDING   0.24 seconds
SubjectPrefix                 PASS      0.11 seconds
BuildKernel                   PASS      24.04 seconds
CheckAllWarning               PASS      26.77 seconds
CheckSparse                   PASS      30.01 seconds
BuildKernel32                 PASS      24.19 seconds
TestRunnerSetup               PASS      429.88 seconds
TestRunner_l2cap-tester       PASS      20.36 seconds
TestRunner_iso-tester         PASS      31.67 seconds
TestRunner_bnep-tester        PASS      4.85 seconds
TestRunner_mgmt-tester        FAIL      120.36 seconds
TestRunner_rfcomm-tester      PASS      7.66 seconds
TestRunner_sco-tester         PASS      9.42 seconds
TestRunner_ioctl-tester       PASS      8.05 seconds
TestRunner_mesh-tester        PASS      6.03 seconds
TestRunner_smp-tester         PASS      7.00 seconds
TestRunner_userchan-tester    PASS      5.06 seconds
IncrementalBuild              PENDING   0.50 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 490, Passed: 484 (98.8%), Failed: 2, Not Run: 4

Failed Test Cases
LL Privacy - Add Device 3 (AL is full)               Failed       0.194 seconds
LL Privacy - Start Discovery 2 (Disable RL)          Failed       0.162 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth

[e-mail] Jan. 21, 2025, 4:40 p.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Mon, 20 Jan 2025 18:39:39 +0800 you wrote:
> From: Hsin-chen Chuang <[e-mail]>
> 
> The function enters infinite recursion if the HCI device doesn't support
> GPIO reset: btusb_reset -> hdev->reset -> vendor_reset -> btusb_reset...
> 
> btusb_reset shouldn't call hdev->reset after commit f07d478090b0
> ("Bluetooth: Get rid of cmd_timeout and use the reset callback")
> 
> [...]

Here is the summary with links:
  - Bluetooth: Fix possible infinite recursion of btusb_reset
    https://git.kernel.org/bluetooth/bluetooth-next/c/9e2714de7384

You are awesome, thank you!

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 9aa018d4f6f5..526c1926a407 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -899,11 +899,6 @@  static void btusb_reset(struct hci_dev *hdev)
 	struct btusb_data *data;
 	int err;
 
-	if (hdev->reset) {
-		hdev->reset(hdev);
-		return;
-	}
-
 	data = hci_get_drvdata(hdev);
 	/* This is not an unbalanced PM reference since the device will reset */
 	err = usb_autopm_get_interface(data->intf);