mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 03:27:30 -04:00
Bluetooth: hci_qca: fix NULL pointer dereference in qca_setup() for non-serdev device
hu->serdev is NULL for hci_uart attached via non-serdev paths, but
qca_setup() unconditionally calls serdev_device_get_drvdata(hu->serdev)
and dereferences the result, causing a NULL pointer dereference.
Fix by guarding the dereference with a NULL check, consistent with the
rest of qca_setup().
Fixes: 22d893eec0 ("Bluetooth: hci_qca: Refactor HFP hardware offload capability handling")
Signed-off-by: Zijun Hu <zijun.hu@oss.qualcomm.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
committed by
Luiz Augusto von Dentz
parent
88b4d528ed
commit
3ec629fee1
@@ -1916,9 +1916,12 @@ static int qca_setup(struct hci_uart *hu)
|
||||
const char *rampatch_name = qca_get_rampatch_name(hu);
|
||||
int ret;
|
||||
struct qca_btsoc_version ver;
|
||||
struct qca_serdev *qcadev = serdev_device_get_drvdata(hu->serdev);
|
||||
struct qca_serdev *qcadev = NULL;
|
||||
const char *soc_name;
|
||||
|
||||
if (hu->serdev)
|
||||
qcadev = serdev_device_get_drvdata(hu->serdev);
|
||||
|
||||
ret = qca_check_speeds(hu);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -1980,7 +1983,7 @@ static int qca_setup(struct hci_uart *hu)
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_WCN7850:
|
||||
if (qcadev->bdaddr_property_broken)
|
||||
if (qcadev && qcadev->bdaddr_property_broken)
|
||||
hci_set_quirk(hdev, HCI_QUIRK_BDADDR_PROPERTY_BROKEN);
|
||||
|
||||
hci_set_aosp_capable(hdev);
|
||||
@@ -2073,7 +2076,7 @@ static int qca_setup(struct hci_uart *hu)
|
||||
else
|
||||
hu->hdev->set_bdaddr = qca_set_bdaddr;
|
||||
|
||||
if (qcadev->support_hfp_hw_offload)
|
||||
if (qcadev && qcadev->support_hfp_hw_offload)
|
||||
qca_configure_hfp_offload(hdev);
|
||||
|
||||
qca->fw_version = le16_to_cpu(ver.patch_ver);
|
||||
|
||||
Reference in New Issue
Block a user