[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170113153534.2617372-1-arnd@arndb.de>
Date: Fri, 13 Jan 2017 16:35:03 +0100
From: Arnd Bergmann <arnd@...db.de>
To: Amitkumar Karwar <akarwar@...vell.com>,
Kalle Valo <kvalo@...eaurora.org>
Cc: Arnd Bergmann <arnd@...db.de>,
Nishant Sarmukadam <nishants@...vell.com>,
Brian Norris <briannorris@...omium.org>,
Xinming Hu <huxm@...vell.com>, Cathy Luo <cluo@...vell.com>,
Shengzhen Li <szli@...vell.com>,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] mwifiex: fix uninitialized variable access in pcie_remove
Checking the firmware status from PCIe register only works
if the register is available, otherwise we end up with
random behavior:
drivers/net/wireless/marvell/mwifiex/pcie.c: In function 'mwifiex_pcie_remove':
drivers/net/wireless/marvell/mwifiex/pcie.c:585:5: error: 'fw_status' may be used uninitialized in this function [-Werror=maybe-uninitialized]
This makes sure we treat the absence of the register as a failure.
Fixes: 045f0c1b5e26 ("mwifiex: get rid of global user_rmmod flag")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
drivers/net/wireless/marvell/mwifiex/pcie.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 031141663fc0..eebc68caecdd 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -581,6 +581,8 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
reg = card->pcie.reg;
if (reg)
ret = mwifiex_read_reg(adapter, reg->fw_status, &fw_status);
+ else
+ fw_status = -1;
if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) {
mwifiex_deauthenticate_all(adapter);
--
2.9.0
Powered by blists - more mailing lists