lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 117/203] rsi: fix potential null dereference in rsi_probe()
    Date
    From: Denis Efremov <efremov@linux.com>

    commit f170d44bc4ec2feae5f6206980e7ae7fbf0432a0 upstream.

    The id pointer can be NULL in rsi_probe(). It is checked everywhere except
    for the else branch in the idProduct condition. The patch adds NULL check
    before the id dereference in the rsi_dbg() call.

    Fixes: 54fdb318c111 ("rsi: add new device model for 9116")
    Cc: Amitkumar Karwar <amitkarwar@gmail.com>
    Cc: Siva Rebbagondla <siva8118@gmail.com>
    Cc: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Denis Efremov <efremov@linux.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/wireless/rsi/rsi_91x_usb.c
    +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
    @@ -793,7 +793,7 @@ static int rsi_probe(struct usb_interfac
    adapter->device_model = RSI_DEV_9116;
    } else {
    rsi_dbg(ERR_ZONE, "%s: Unsupported RSI device id 0x%x\n",
    - __func__, id->idProduct);
    + __func__, id ? id->idProduct : 0x0);
    goto err1;
    }


    \
     
     \ /
      Last update: 2020-01-17 00:45    [W:3.254 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site