lkml.org 
[lkml]   [2018]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 23/88] NFC: Fix possible memory corruption when handling SHDLC I-Frame commands
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Suren Baghdasaryan <surenb@google.com>

    commit 674d9de02aa7d521ebdf66c3958758bdd9c64e11 upstream.

    When handling SHDLC I-Frame commands "pipe" field used for indexing
    into an array should be checked before usage. If left unchecked it
    might access memory outside of the array of size NFC_HCI_MAX_PIPES(127).

    Malformed NFC HCI frames could be injected by a malicious NFC device
    communicating with the device being attacked (remote attack vector),
    or even by an attacker with physical access to the I2C bus such that
    they could influence the data transfers on that bus (local attack vector).
    skb->data is controlled by the attacker and has only been sanitized in
    the most trivial ways (CRC check), therefore we can consider the
    create_info struct and all of its members to tainted. 'create_info->pipe'
    with max value of 255 (uint8) is used to take an offset of the
    hdev->pipes array of 127 elements which can lead to OOB write.

    Cc: Samuel Ortiz <sameo@linux.intel.com>
    Cc: Allen Pais <allen.pais@oracle.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Suggested-by: Kevin Deus <kdeus@google.com>
    Signed-off-by: Suren Baghdasaryan <surenb@google.com>
    Acked-by: Kees Cook <keescook@chromium.org>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/nfc/hci/core.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    --- a/net/nfc/hci/core.c
    +++ b/net/nfc/hci/core.c
    @@ -209,6 +209,11 @@ void nfc_hci_cmd_received(struct nfc_hci
    }
    create_info = (struct hci_create_pipe_resp *)skb->data;

    + if (create_info->pipe >= NFC_HCI_MAX_PIPES) {
    + status = NFC_HCI_ANY_E_NOK;
    + goto exit;
    + }
    +
    /* Save the new created pipe and bind with local gate,
    * the description for skb->data[3] is destination gate id
    * but since we received this cmd from host controller, we
    @@ -232,6 +237,11 @@ void nfc_hci_cmd_received(struct nfc_hci
    }
    delete_info = (struct hci_delete_pipe_noti *)skb->data;

    + if (delete_info->pipe >= NFC_HCI_MAX_PIPES) {
    + status = NFC_HCI_ANY_E_NOK;
    + goto exit;
    + }
    +
    hdev->pipes[delete_info->pipe].gate = NFC_HCI_INVALID_GATE;
    hdev->pipes[delete_info->pipe].dest_host = NFC_HCI_INVALID_HOST;
    break;

    \
     
     \ /
      Last update: 2018-09-27 11:09    [W:4.523 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site