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

commit 629b49c848ee71244203934347bd7730b0ddee8d upstream.

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

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>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 33c3c5b0fef0e3b8121812ecc753a40c2ab8fb19..7bf6860fed783c647f8d617cc9b0f9e63c97beb0 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4067,6 +4067,9 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
                struct inquiry_info_with_rssi_and_pscan_mode *info;
                info = (void *) (skb->data + 1);
 
+               if (skb->len < num_rsp * sizeof(*info) + 1)
+                       goto unlock;
+
                for (; num_rsp; num_rsp--, info++) {
                        u32 flags;
 
@@ -4088,6 +4091,9 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
        } else {
                struct inquiry_info_with_rssi *info = (void *) (skb->data + 1);
 
+               if (skb->len < num_rsp * sizeof(*info) + 1)
+                       goto unlock;
+
                for (; num_rsp; num_rsp--, info++) {
                        u32 flags;
 
@@ -4108,6 +4114,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
                }
        }
 
+unlock:
        hci_dev_unlock(hdev);
 }