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

Commit 34f05f54 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Johannes Berg
Browse files

cfg80211: avoid mem leak on driver hint set 



In the already-set and intersect case of a driver-hint, the previous
wiphy regdomain was not freed before being reset with a copy of the
cfg80211 regdomain.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 08f6f147

net/wireless/reg.c

+4 −1
Original line number Diff line number Diff line
@@ -1907,7 +1907,7 @@ static enum reg_request_treatment 
reg_process_hint_driver(struct wiphy *wiphy,

			struct regulatory_request *driver_request)

{

	const struct ieee80211_regdomain *regd;

	const struct ieee80211_regdomain *regd, *tmp;

	enum reg_request_treatment treatment;



	treatment = __reg_process_hint_driver(driver_request);
@@ -1927,7 +1927,10 @@ reg_process_hint_driver(struct wiphy *wiphy, 
			reg_free_request(driver_request);

			return REG_REQ_IGNORE;

		}



		tmp = get_wiphy_regdom(wiphy);

		rcu_assign_pointer(wiphy->regd, regd);

		rcu_free_regdom(tmp);

	}