summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/marvell
diff options
context:
space:
mode:
authorAmitkumar Karwar2016-12-01 14:53:31 +0100
committerKalle Valo2016-12-30 12:19:40 +0100
commit74c8719b8ee0922593a5cbec0bd6127d86d8a2f4 (patch)
tree25744644e81f296298a2419398072cd0a42f5ff0 /drivers/net/wireless/marvell
parentadm80211: add checks for dma mapping errors (diff)
downloadkernel-qcow2-linux-74c8719b8ee0922593a5cbec0bd6127d86d8a2f4.tar.gz
kernel-qcow2-linux-74c8719b8ee0922593a5cbec0bd6127d86d8a2f4.tar.xz
kernel-qcow2-linux-74c8719b8ee0922593a5cbec0bd6127d86d8a2f4.zip
mwifiex: sdio: fix use after free issue for save_adapter
If we have sdio work requests received when sdio card reset is happening, we may end up accessing older save_adapter pointer later which is already freed during card reset. This patch solves the problem by cancelling those pending requests. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell')
-rw-r--r--drivers/net/wireless/marvell/mwifiex/sdio.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 740d79cd91fa..43facba641bf 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -2237,6 +2237,12 @@ static void mwifiex_recreate_adapter(struct sdio_mmc_card *card)
mmc_hw_reset(func->card->host);
sdio_release_host(func);
+ /* Previous save_adapter won't be valid after this. We will cancel
+ * pending work requests.
+ */
+ clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags);
+ clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &iface_work_flags);
+
mwifiex_sdio_probe(func, device_id);
}