redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

mwifiex: move del_timer_sync(scan_delay_timer) call to fix memleak

Browse source 
Currently it is in mwifiex_adapter_cleanup() which doesn't get
called if driver initialization is failed causing memory leak.

scan_delay_timer is initialized in mwifiex_register(), so it
should be deleted in mwifiex_unregister(). Hence it has been
moved to appropriate place.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar 2013-07-22 19:17:48 -07:00 committed by John W. Linville
parent 43ba6b9f2f
commit 003d87cbec
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/wireless/mwifiex/init.c
View file

@ -378,18 +378,11 @@ static void mwifiex_free_lock_list(struct mwifiex_adapter *adapter)
static void
mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter)
{
int i;
if (!adapter) {
pr_err("%s: adapter is NULL\n", __func__);
return;
}
for (i = 0; i < adapter->priv_num; i++) {
if (adapter->priv[i])
del_timer_sync(&adapter->priv[i]->scan_delay_timer);
}
mwifiex_cancel_all_pending_cmd(adapter);
/* Free lock variables */

1
drivers/net/wireless/mwifiex/main.c
View file

@ -197,6 +197,7 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter)
for (i = 0; i < adapter->priv_num; i++) {
if (adapter->priv[i]) {
mwifiex_free_curr_bcn(adapter->priv[i]);
del_timer_sync(&adapter->priv[i]->scan_delay_timer);
kfree(adapter->priv[i]);
}
}