[PATCH 122/379][SRU][OEM-5.6] Bluetooth: hci_qca: Fix uninitialized access to hdev
You-Sheng Yang
vicamo.yang at canonical.com
Wed Dec 23 08:47:35 UTC 2020
From: Abhishek Pandit-Subedi <abhishekpandit at chromium.org>
BugLink: https://bugs.launchpad.net/bugs/1879633
hdev is always allocated and not only when power control is required.
Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit at chromium.org>
Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
(cherry picked from commit 85e90d9391f57436b6f7f00503de370a657420ba)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
drivers/bluetooth/hci_qca.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 26efe822f6e5..e4a68238fcb9 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1947,8 +1947,9 @@ static int qca_serdev_probe(struct serdev_device *serdev)
}
}
+ hdev = qcadev->serdev_hu.hdev;
+
if (power_ctrl_enabled) {
- hdev = qcadev->serdev_hu.hdev;
set_bit(HCI_QUIRK_NON_PERSISTENT_SETUP, &hdev->quirks);
hdev->shutdown = qca_power_off;
}
--
2.29.2
More information about the kernel-team
mailing list