lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 231/542] orinoco: avoid assertion in case of NULL pointer
    Date
    From: Aditya Pakki <pakki001@umn.edu>

    [ Upstream commit c705f9fc6a1736dcf6ec01f8206707c108dca824 ]

    In ezusb_init, if upriv is NULL, the code crashes. However, the caller
    in ezusb_probe can handle the error and print the failure message.
    The patch replaces the BUG_ON call to error return.

    Signed-off-by: Aditya Pakki <pakki001@umn.edu>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intersil/orinoco/orinoco_usb.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
    index 8c79b963bcffb..e753f43e0162f 100644
    --- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
    +++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
    @@ -1361,7 +1361,8 @@ static int ezusb_init(struct hermes *hw)
    int retval;

    BUG_ON(in_interrupt());
    - BUG_ON(!upriv);
    + if (!upriv)
    + return -EINVAL;

    upriv->reply_count = 0;
    /* Write the MAGIC number on the simulated registers to keep
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:11    [W:2.168 / U:5.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site