| Message ID | 20240319154611.2492-2-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | 8185331e953d67da30b2ef8f0446b9ce73e3d016 |
| Headers | show |
| Series | Bluetooth: qca: fix NULL-deref on non-serdev setup | expand |
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=836459 ---Test result--- Test Summary: CheckPatch PASS 1.37 seconds GitLint PASS 0.68 seconds SubjectPrefix PASS 0.26 seconds BuildKernel PASS 28.52 seconds CheckAllWarning PASS 31.44 seconds CheckSparse PASS 37.17 seconds CheckSmatch PASS 100.28 seconds BuildKernel32 PASS 28.14 seconds TestRunnerSetup PASS 519.52 seconds TestRunner_l2cap-tester PASS 20.20 seconds TestRunner_iso-tester PASS 30.52 seconds TestRunner_bnep-tester PASS 4.81 seconds TestRunner_mgmt-tester FAIL 108.33 seconds TestRunner_rfcomm-tester PASS 7.41 seconds TestRunner_sco-tester PASS 15.08 seconds TestRunner_ioctl-tester PASS 7.89 seconds TestRunner_mesh-tester PASS 5.91 seconds TestRunner_smp-tester PASS 6.93 seconds TestRunner_userchan-tester PASS 5.04 seconds IncrementalBuild PASS 32.26 seconds Details ############################## Test: TestRunner_mgmt-tester - FAIL Desc: Run mgmt-tester with test-runner Output: Total: 492, Passed: 489 (99.4%), Failed: 1, Not Run: 2 Failed Test Cases LL Privacy - Add Device 7 (AL is full) Failed 0.202 seconds --- Regards, Linux Bluetooth
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index c73481c57741..84f728943962 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1672,6 +1672,9 @@ static bool qca_wakeup(struct hci_dev *hdev) struct hci_uart *hu = hci_get_drvdata(hdev); bool wakeup; + if (!hu->serdev) + return true; + /* BT SoC attached through the serial bus is handled by the serdev driver. * So we need to use the device handle of the serdev driver to get the * status of device may wakeup.
Qualcomm ROME controllers can be registered from the Bluetooth line discipline and in this case the HCI UART serdev pointer is NULL. Add the missing sanity check to prevent a NULL-pointer dereference when wakeup() is called for a non-serdev controller during suspend. Just return true for now to restore the original behaviour and address the crash with pre-6.2 kernels, which do not have commit e9b3e5b8c657 ("Bluetooth: hci_qca: only assign wakeup with serial port support") that causes the crash to happen already at setup() time. Fixes: c1a74160eaf1 ("Bluetooth: hci_qca: Add device_may_wakeup support") Cc: stable@vger.kernel.org # 5.13 Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/bluetooth/hci_qca.c | 3 +++ 1 file changed, 3 insertions(+)