Commit 6508497c authored by Colin Ian King's avatar Colin Ian King Committed by Kalle Valo

rsi: fix a dereference on adapter before it has been null checked

The assignment of dev is dereferencing adapter before adapter has
been null checked, potentially leading to a null pointer dereference.
Fix this by simply moving the assignment of dev to a later point
after the sanity null check of adapter.

Detected by CoverityScan CID#1398383 ("Dereference before null check")

Fixes: dad0d04f ("rsi: Add RS9113 wireless driver")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent af756872
...@@ -73,8 +73,7 @@ static int rsi_write_multiple(struct rsi_hw *adapter, ...@@ -73,8 +73,7 @@ static int rsi_write_multiple(struct rsi_hw *adapter,
u8 *data, u8 *data,
u32 count) u32 count)
{ {
struct rsi_91x_usbdev *dev = struct rsi_91x_usbdev *dev;
(struct rsi_91x_usbdev *)adapter->rsi_dev;
if (!adapter) if (!adapter)
return -ENODEV; return -ENODEV;
...@@ -82,6 +81,7 @@ static int rsi_write_multiple(struct rsi_hw *adapter, ...@@ -82,6 +81,7 @@ static int rsi_write_multiple(struct rsi_hw *adapter,
if (endpoint == 0) if (endpoint == 0)
return -EINVAL; return -EINVAL;
dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;
if (dev->write_fail) if (dev->write_fail)
return -ENETDOWN; return -ENETDOWN;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment