2021-01-06 05:00:50

by Abhishek Pandit-Subedi

Subject: [PATCH v2] Bluetooth: btrtl: Add null check in setup

btrtl_dev->ic_info is only available from the controller on cold boot
(the lmp subversion matches the device model and this is used to look up
the ic_info). On warm boots (firmware already loaded),
btrtl_dev->ic_info is null.

Fixes: 05672a2c14a4 (Bluetooth: btrtl: Enable central-peripheral role)
Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
---

Changes in v2:
- Added nullcheck with goto done

drivers/bluetooth/btrtl.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 1abf6a4d6727..24f03a1f8d57 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -719,6 +719,9 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
*/
set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);

+ if (!btrtl_dev->ic_info)
+ goto done;
+
/* Enable central-peripheral role (able to create new connections with
* an existing connection in slave role).
*/
@@ -731,6 +734,7 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
break;
}

+done:
btrtl_free(btrtl_dev);
return ret;
}
--
2.29.2.729.g45daf8777d-goog

2021-01-06 07:54:02

by Marcel Holtmann

Subject: Re: [PATCH v2] Bluetooth: btrtl: Add null check in setup

Hi Abhishek,

> btrtl_dev->ic_info is only available from the controller on cold boot
> (the lmp subversion matches the device model and this is used to look up
> the ic_info). On warm boots (firmware already loaded),
> btrtl_dev->ic_info is null.
>
> Fixes: 05672a2c14a4 (Bluetooth: btrtl: Enable central-peripheral role)
> Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
> ---
>
> Changes in v2:
> - Added nullcheck with goto done
>
> drivers/bluetooth/btrtl.c | 4 ++++
> 1 file changed, 4 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel