]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mwifiex: fix uninitialized variable access in pcie_remove
authorArnd Bergmann <arnd@arndb.de>
Fri, 13 Jan 2017 15:35:03 +0000 (16:35 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 17 Jan 2017 11:54:57 +0000 (13:54 +0200)
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@arndb.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwifiex/pcie.c

index 66226c615be0b18fa27536e93a76f17175aa8587..4d78087ea13a8512d1105ab98053be04e21039c0 100644 (file)
@@ -299,6 +299,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);