orinoco: avoid assertion in case of NULL pointer
authorAditya Pakki <pakki001@umn.edu>
Sun, 15 Dec 2019 19:58:58 +0000 (13:58 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:34:43 +0000 (08:34 +0100)
[ 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

index 2c7dd2a..b704e4b 100644 (file)
@@ -1364,7 +1364,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