diff options
| author |   Peilin Ye <yepeilin.cs@gmail.com> | 2020-07-10 17:45:26 -0400 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2020-07-13 18:40:58 +0200 |
| commit | 629b49c848ee71244203934347bd7730b0ddee8d (patch) | |
| tree | 42e45f49e1e4708931974cff86f8ea437041c6e2 /net/bluetooth/hci_event.c | |
| parent | Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_evt() (diff) | |
| download | linux-dev-629b49c848ee71244203934347bd7730b0ddee8d.tar.xz linux-dev-629b49c848ee71244203934347bd7730b0ddee8d.zip | |
Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_with_rssi_evt()
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>
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index b97d0247983c..61f8c4d12028 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4159,6 +4159,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; @@ -4180,6 +4183,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; @@ -4200,6 +4206,7 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, } } +unlock: hci_dev_unlock(hdev); } |