From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Mon, 17 Oct 2016 15:25:16 +0000 (+0000)
Subject: cfg80211: fix possible memory leak in cfg80211_iter_combinations()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=320c975f180b19296f0fd6c5bf2144e633aaba5e;p=linux-beck.git

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: 0c317a02ca98 ("cfg80211: support virtual interfaces with different beacon intervals")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/util.c b/net/wireless/util.c
index d2ea1f152d17..ec17c2800117 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1676,8 +1676,10 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
 
 		if (params->beacon_int_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;
+			}
 			if (!c->beacon_int_min_gcd &&
 			    params->beacon_int_different)
 				goto cont;