| Message ID | 20180426131324.GA982@embeddedor.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 48c6b5c9c1180b7f8b35edeaef9b3aa3e3b6c9d5 |
| Delegated to: | Kalle Valo |
| Headers | show |
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote: > There is a potential execution path in which variable ret is returned > without being properly initialized previously. > > Fix this by storing the value returned by function > rsi_usb_master_reg_write into _ret_. > > Addresses-Coverity-ID: 1468407 ("Uninitialized scalar variable") > Fixes: 16d3bb7b2f37 ("rsi: disable fw watchdog timer during reset") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Patch applied to wireless-drivers-next.git, thanks. 48c6b5c9c118 rsi_91x: fix uninitialized variable
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index b065438..6ce6b75 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -687,9 +687,10 @@ static int rsi_reset_card(struct rsi_hw *adapter) */ msleep(100); - if (rsi_usb_master_reg_write(adapter, SWBL_REGOUT, - RSI_FW_WDT_DISABLE_REQ, - RSI_COMMON_REG_SIZE) < 0) { + ret = rsi_usb_master_reg_write(adapter, SWBL_REGOUT, + RSI_FW_WDT_DISABLE_REQ, + RSI_COMMON_REG_SIZE); + if (ret < 0) { rsi_dbg(ERR_ZONE, "Disabling firmware watchdog timer failed\n"); goto fail; }
There is a potential execution path in which variable ret is returned without being properly initialized previously. Fix this by storing the value returned by function rsi_usb_master_reg_write into _ret_. Addresses-Coverity-ID: 1468407 ("Uninitialized scalar variable") Fixes: 16d3bb7b2f37 ("rsi: disable fw watchdog timer during reset") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/net/wireless/rsi/rsi_91x_usb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)