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

Commit b7566fc3 authored by Larry Finger's avatar Larry Finger Committed by Johannes Berg
Browse files

cfg80211: Fix memory leak 



When a driver requests a specific regulatory domain after cfg80211 already
has one, a struct ieee80211_regdomain is leaked.

Reported-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 78f42aee

net/wireless/reg.c

+7 −2
Original line number Diff line number Diff line
@@ -2189,10 +2189,15 @@ static int __set_regdom(const struct ieee80211_regdomain *rd) 
		 * However if a driver requested this specific regulatory

		 * domain we keep it for its private use

		 */

		if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER)

		if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER) {

			const struct ieee80211_regdomain *tmp;



			tmp = get_wiphy_regdom(request_wiphy);

			rcu_assign_pointer(request_wiphy->regd, rd);

		else

			rcu_free_regdom(tmp);

		} else {

			kfree(rd);

		}



		rd = NULL;