niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mwifiex: fix possible memory leak in mwifiex_cfg80211_start_ap()

Browse source 
memory is malloced in mwifiex_cfg80211_start_ap() and should be
freed before leaving from the error handling cases, otherwise it
will cause memory leak.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Wei Yongjun 2016-07-12 11:43:18 +00:00 • committed by Kalle Valo
parent 83d58d53e0
commit 4028a514ea
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/wireless/marvell/mwifiex/cfg80211.c
View file

@ -1936,10 +1936,9 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
mwifiex_set_uap_rates(bss_cfg, params); mwifiex_set_uap_rates(bss_cfg, params);
if (mwifiex_set_secure_params(priv, bss_cfg, params)) { if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
kfree(bss_cfg);
mwifiex_dbg(priv->adapter, ERROR, mwifiex_dbg(priv->adapter, ERROR,
"Failed to parse secuirty parameters!\n"); "Failed to parse secuirty parameters!\n");
return -1; goto out;
} }
mwifiex_set_ht_params(priv, bss_cfg, params); mwifiex_set_ht_params(priv, bss_cfg, params);
@ -1968,7 +1967,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
if (mwifiex_11h_activate(priv, false)) { if (mwifiex_11h_activate(priv, false)) {
mwifiex_dbg(priv->adapter, ERROR, mwifiex_dbg(priv->adapter, ERROR,
"Failed to disable 11h extensions!!"); "Failed to disable 11h extensions!!");
return -1; goto out;
} }
priv->state_11h.is_11h_active = false; priv->state_11h.is_11h_active = false;
} }
@ -1976,12 +1975,11 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
if (mwifiex_config_start_uap(priv, bss_cfg)) { if (mwifiex_config_start_uap(priv, bss_cfg)) {
mwifiex_dbg(priv->adapter, ERROR, mwifiex_dbg(priv->adapter, ERROR,
"Failed to start AP\n"); "Failed to start AP\n");
kfree(bss_cfg); goto out;
return -1;
} }
if (mwifiex_set_mgmt_ies(priv, &params->beacon)) if (mwifiex_set_mgmt_ies(priv, &params->beacon))
return -1; goto out;
if (!netif_carrier_ok(priv->netdev)) if (!netif_carrier_ok(priv->netdev))
netif_carrier_on(priv->netdev); netif_carrier_on(priv->netdev);
@ -1990,6 +1988,10 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
memcpy(&priv->bss_cfg, bss_cfg, sizeof(priv->bss_cfg)); memcpy(&priv->bss_cfg, bss_cfg, sizeof(priv->bss_cfg));
kfree(bss_cfg); kfree(bss_cfg);
return 0; return 0;
out:
kfree(bss_cfg);
return -1;
} }
/* /*