From: Bing Zhao Date: Thu, 9 May 2013 18:42:54 +0000 (-0700) Subject: UPSTREAM mwifiex: fix memory leak issue when driver unload X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=cc7cd8696f158fd7323cd05fadecf1226332d88d UPSTREAM mwifiex: fix memory leak issue when driver unload After unregister_netdevice() call the request is queued and reg_state is changed to NETREG_UNREGISTERING. As we check for NETREG_UNREGISTERED state, free_netdev() never gets executed causing memory leak. Initialize "dev->destructor" to free_netdev() to free device data after unregistration. BUG=None TEST="iwlist mlan0 scan & sleep 1; rmmod mwifiex_sdio"; "echo scan > /sys/kernel/debug/kmemleak; cat /sys/kernel/debug/kmemleak" Change-Id: I4ac505e2711770a2536dd5434e5dc2ff020e406b Cc: Reported-by: Daniel Drake Tested-by: Daniel Drake Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville Reviewed-on: https://gerrit.chromium.org/gerrit/50683 Reviewed-by: Paul Stewart --- diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index 23f79daf7eb0..54cb8c6da63b 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -1611,9 +1611,6 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev) if (dev->reg_state == NETREG_REGISTERED) unregister_netdevice(dev); - if (dev->reg_state == NETREG_UNREGISTERED) - free_netdev(dev); - /* Clear the priv in adapter */ priv->netdev = NULL; diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 462ec8159098..0a95b462eb01 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -633,6 +633,7 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { dev->netdev_ops = &mwifiex_netdev_ops; + dev->destructor = free_netdev; /* Initialize private structure */ priv->current_key_index = 0; priv->media_connected = false;