lkml.org 
[lkml]   [2020]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 19/67] Bluetooth: Prevent out-of-bounds read in hci_inquiry_result_with_rssi_evt()
    Date
    From: Peilin Ye <yepeilin.cs@gmail.com>

    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>

    ---
    net/bluetooth/hci_event.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/net/bluetooth/hci_event.c
    +++ b/net/bluetooth/hci_event.c
    @@ -4067,6 +4067,9 @@ static void hci_inquiry_result_with_rssi
    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
    } 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
    }
    }

    +unlock:
    hci_dev_unlock(hdev);
    }


    \
     
     \ /
      Last update: 2020-08-10 17:38    [W:2.855 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site