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

Commit 5bf16a11 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: don't require RTNL held for regdomain reads 



The whole code is set up to allow RCU reads of this data, but
then uses rtnl_dereference() which requires the RTNL. Convert
it to rcu_dereference_rtnl() which makes it require only RCU
or the RTNL, to allow RCU-protected reading of the data.

Reviewed-by: default avatarCoelho, Luciano <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 230ebaa1

net/wireless/reg.c

+2 −2
Original line number Diff line number Diff line
@@ -135,12 +135,12 @@ static void restore_regulatory_settings(bool reset_user); 


static const struct ieee80211_regdomain *get_cfg80211_regdom(void)

{

	return rtnl_dereference(cfg80211_regdomain);

	return rcu_dereference_rtnl(cfg80211_regdomain);

}



const struct ieee80211_regdomain *get_wiphy_regdom(struct wiphy *wiphy)

{

	return rtnl_dereference(wiphy->regd);

	return rcu_dereference_rtnl(wiphy->regd);

}



static const char *reg_dfs_region_str(enum nl80211_dfs_regions dfs_region)