Browse Source

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>
Wei Yongjun 8 years ago
parent
commit
320c975f18
1 changed files with 3 additions and 1 deletions
  1. 3 1
      net/wireless/util.c

+ 3 - 1
net/wireless/util.c

@@ -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;