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

Commit 320c975f authored by Wei Yongjun's avatar Wei Yongjun Committed by Johannes Berg
Browse files

cfg80211: fix possible memory leak in cfg80211_iter_combinations() 



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

Fixes: 0c317a02 ("cfg80211: support virtual interfaces with different beacon intervals")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a3e2f4b6

net/wireless/util.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -1676,8 +1676,10 @@ int cfg80211_iter_combinations(struct wiphy *wiphy, 




		if (params->beacon_int_gcd) {

		if (params->beacon_int_gcd) {

			if (c->beacon_int_min_gcd &&

			if (c->beacon_int_min_gcd &&

			    params->beacon_int_gcd < c->beacon_int_min_gcd)

			    params->beacon_int_gcd < c->beacon_int_min_gcd) {

				kfree(limits);

				return -EINVAL;

				return -EINVAL;

			}

			if (!c->beacon_int_min_gcd &&

			if (!c->beacon_int_min_gcd &&

			    params->beacon_int_different)

			    params->beacon_int_different)

				goto cont;

				goto cont;