Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt()

BugLink: https://bugs.launchpad.net/bugs/1891387
commit 75bbd2ea50ba1c5d9da878a17e92eac02fe0fd3a upstream.

Check `num_rsp` before using it as for-loop counter.

Cc: stable@vger.kernel.org
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Ian May <ian.may@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c7e4496b243e7606b5321c47dfa9b387923168f1..33c3c5b0fef0e3b8121812ecc753a40c2ab8fb19 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2444,7 +2444,7 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
        BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
 
-       if (!num_rsp)
+       if (!num_rsp || skb->len < num_rsp * sizeof(*info) + 1)
                return;
 
        if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))