]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Bluetooth: qca: fix info leak when fetching board id
authorJohan Hovold <johan+linaro@kernel.org>
Wed, 1 May 2024 12:34:53 +0000 (14:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 May 2024 10:15:11 +0000 (12:15 +0200)
commit 0adcf6be1445ed50bfd4a451a7a782568f270197 upstream.

Add the missing sanity check when fetching the board id to avoid leaking
slab data when later requesting the firmware.

Fixes: a7f8dedb4be2 ("Bluetooth: qca: add support for QCA2066")
Cc: stable@vger.kernel.org # 6.7
Cc: Tim Jiang <quic_tjiang@quicinc.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/bluetooth/btqca.c

index c6b2dd4d171623834b9c14eef8043b41054d4760..4f856ac97e332695ada26308dd0f79146f554b1b 100644 (file)
@@ -235,6 +235,11 @@ static int qca_read_fw_board_id(struct hci_dev *hdev, u16 *bid)
                goto out;
        }
 
+       if (skb->len < 3) {
+               err = -EILSEQ;
+               goto out;
+       }
+
        *bid = (edl->data[1] << 8) + edl->data[2];
        bt_dev_dbg(hdev, "%s: bid = %x", __func__, *bid);