lkml.org 
[lkml]   [2015]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 002/159] nfc: nci: hci: Add check on skb nci_hci_send_cmd parameter
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Christophe Ricard <christophe.ricard@gmail.com>

    commit 5a9e0ffc0f128ecdf7c770f76c268e4f9f3c9118 upstream.

    skb can be NULL and may lead to a NULL pointer error.

    Add a check condition before setting HCI rx buffer.

    Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/nfc/nci/hci.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/nfc/nci/hci.c
    +++ b/net/nfc/nci/hci.c
    @@ -233,7 +233,7 @@ int nci_hci_send_cmd(struct nci_dev *nde
    r = nci_request(ndev, nci_hci_send_data_req, (unsigned long)&data,
    msecs_to_jiffies(NCI_DATA_TIMEOUT));

    - if (r == NCI_STATUS_OK)
    + if (r == NCI_STATUS_OK && skb)
    *skb = conn_info->rx_skb;

    return r;



    \
     
     \ /
      Last update: 2015-09-27 00:01    [W:4.093 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site