summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeilin Ye <yepeilin.cs@gmail.com>2020-07-10 17:39:18 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-21 09:47:58 +0200
commit8b0861f956f65f063662f9553a4dcad574a95b37 (patch)
tree9e084f5799da1e2a93e2e6b5adab5758ce775710
parentd91299b8382b129156708708d69876e753b9ade6 (diff)
downloadlinux-stable-8b0861f956f65f063662f9553a4dcad574a95b37.tar.gz
linux-stable-8b0861f956f65f063662f9553a4dcad574a95b37.tar.bz2
linux-stable-8b0861f956f65f063662f9553a4dcad574a95b37.zip
Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt()
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>
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index b398272bc729..975f73b58330 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2094,7 +2094,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))