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: Arik Nemtsov <arikx.nemtsov@intel.com> Acked-by: Luis R. Rodriguez <mcgrof@suse.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
08f6f14777
commit
34f05f543f
|
@ -1907,7 +1907,7 @@ static enum reg_request_treatment
|
||||||
reg_process_hint_driver(struct wiphy *wiphy,
|
reg_process_hint_driver(struct wiphy *wiphy,
|
||||||
struct regulatory_request *driver_request)
|
struct regulatory_request *driver_request)
|
||||||
{
|
{
|
||||||
const struct ieee80211_regdomain *regd;
|
const struct ieee80211_regdomain *regd, *tmp;
|
||||||
enum reg_request_treatment treatment;
|
enum reg_request_treatment treatment;
|
||||||
|
|
||||||
treatment = __reg_process_hint_driver(driver_request);
|
treatment = __reg_process_hint_driver(driver_request);
|
||||||
|
@ -1927,7 +1927,10 @@ reg_process_hint_driver(struct wiphy *wiphy,
|
||||||
reg_free_request(driver_request);
|
reg_free_request(driver_request);
|
||||||
return REG_REQ_IGNORE;
|
return REG_REQ_IGNORE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tmp = get_wiphy_regdom(wiphy);
|
||||||
rcu_assign_pointer(wiphy->regd, regd);
|
rcu_assign_pointer(wiphy->regd, regd);
|
||||||
|
rcu_free_regdom(tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue