Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4028a514 authored by Wei Yongjun's avatar Wei Yongjun Committed by Kalle Valo
Browse files

mwifiex: fix possible memory leak in mwifiex_cfg80211_start_ap() 



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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 83d58d53

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+8 −6
Original line number Diff line number Diff line
@@ -1936,10 +1936,9 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy, 
	mwifiex_set_uap_rates(bss_cfg, params);



	if (mwifiex_set_secure_params(priv, bss_cfg, params)) {

		kfree(bss_cfg);

		mwifiex_dbg(priv->adapter, ERROR,

			    "Failed to parse secuirty parameters!\n");

		return -1;

		goto out;

	}



	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)) {

			mwifiex_dbg(priv->adapter, ERROR,

				    "Failed to disable 11h extensions!!");

			return -1;

			goto out;

		}

		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)) {

		mwifiex_dbg(priv->adapter, ERROR,

			    "Failed to start AP\n");

		kfree(bss_cfg);

		return -1;

		goto out;

	}



	if (mwifiex_set_mgmt_ies(priv, &params->beacon))

		return -1;

		goto out;



	if (!netif_carrier_ok(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));

	kfree(bss_cfg);

	return 0;



out:

	kfree(bss_cfg);

	return -1;

}



/*