summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGrazvydas Ignotas <notasas@gmail.com>2012-04-26 23:07:43 +0300
committerJohn W. Linville <linville@tuxdriver.com>2012-04-27 15:25:25 -0400
commit328c32f0f85467af5a6c4c3289e168d9ad2555af (patch)
treeacfa86f60e9f26b3c7e57fd28224b5fe1450eb08 /drivers/net
parentdbdedbdf4fbff3d4962a0786f37aa86dfdc48a7e (diff)
downloadop-kernel-dev-328c32f0f85467af5a6c4c3289e168d9ad2555af.zip
op-kernel-dev-328c32f0f85467af5a6c4c3289e168d9ad2555af.tar.gz
wl1251: fix crash on remove due to premature kfree
Currently SDIO glue frees it's own structure before calling wl1251_free_hw(), which in turn calls ieee80211_unregister_hw(). The later call may result in a need to communicate with the chip to stop it (as it happens now if the interface is still up before rmmod), which means calls are made back to the glue, resulting in freed memory access. Fix this by freeing glue data last. Cc: stable@vger.kernel.org # v2.6.37+ Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl1251/sdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
index f786942..1b851f6 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/wl1251/sdio.c
@@ -315,8 +315,8 @@ static void __devexit wl1251_sdio_remove(struct sdio_func *func)
if (wl->irq)
free_irq(wl->irq, wl);
- kfree(wl_sdio);
wl1251_free_hw(wl);
+ kfree(wl_sdio);
sdio_claim_host(func);
sdio_release_irq(func);
OpenPOWER on IntegriCloud