summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rsi
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2019-10-02 19:18:11 +0200
committerKalle Valo <kvalo@codeaurora.org>2019-10-04 15:46:43 +0200
commitf170d44bc4ec2feae5f6206980e7ae7fbf0432a0 (patch)
tree16cf847d8ebbe6e6e35e34e191e42b7a91107704 /drivers/net/wireless/rsi
parentlibertas: remove redundant assignment to variable ret (diff)
downloadlinux-f170d44bc4ec2feae5f6206980e7ae7fbf0432a0.tar.xz
linux-f170d44bc4ec2feae5f6206980e7ae7fbf0432a0.zip
rsi: fix potential null dereference in rsi_probe()
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>
Diffstat (limited to 'drivers/net/wireless/rsi')
-rw-r--r--drivers/net/wireless/rsi/rsi_91x_usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 760eaffeebd6..23a1d00b5f38 100644
--- 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_interface *pfunction,
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;
}