| From f4bb13ab67a9284d178835bff4438100c66ff0c2 Mon Sep 17 00:00:00 2001 |
| From: Denis Efremov <efremov@linux.com> |
| Date: Wed, 2 Oct 2019 20:18:11 +0300 |
| Subject: [PATCH] rsi: fix potential null dereference in rsi_probe() |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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; |
| } |
| |
| -- |
| 2.7.4 |
| |
