]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Bluetooth: hci_qca: Fix crash with non-serdev devices
authorMatthias Kaehlcke <mka@chromium.org>
Tue, 23 Apr 2019 18:16:52 +0000 (11:16 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 23 Apr 2019 19:38:06 +0000 (21:38 +0200)
qca_set_baudrate() calls serdev_device_wait_until_sent() assuming that
the HCI is always associated with a serdev device. This isn't true for
ROME controllers instantiated through ldisc, where the call causes a
crash due to a NULL pointer dereferentiation. Only call the function
when we have a serdev device. The timeout for ROME devices at the end
of qca_set_baudrate() is long enough to be reasonably sure that the
command was sent.

Fixes: fa9ad876b8e0 ("Bluetooth: hci_qca: Add support for Qualcomm Bluetooth chip wcn3990")
Reported-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
Reported-by: Rocky Liao <rjliao@codeaurora.org>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Rocky Liao <rjliao@codeaurora.org>
Tested-by: Rocky Liao <rjliao@codeaurora.org>
Reviewed-by: Balakrishna Godavarthi <bgodavar@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/hci_qca.c

index a80c3bc909042798e497f31b3f20ce19682aa035..7f75652686fee08d1851198351eb1e2a7ec0711f 100644 (file)
@@ -1006,7 +1006,8 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
        while (!skb_queue_empty(&qca->txq))
                usleep_range(100, 200);
 
-       serdev_device_wait_until_sent(hu->serdev,
+       if (hu->serdev)
+               serdev_device_wait_until_sent(hu->serdev,
                      msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS));
 
        /* Give the controller time to process the request */