renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 19:23:57 +08:00
Code

regulatory: fix uevent

Browse Source 
The uevent callback doesn't protect its access to
last_request, which now causes a warning since
the conversion to get_last_request(). Fix this by
allowing to use RCU protection for last_request.

Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-01-09 10:22:07 +01:00
parent c51f878379
commit 4a484cffc5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/wireless/reg.c
View File

@ -140,8 +140,8 @@ static void rcu_free_regdom(const struct ieee80211_regdomain *r)
static struct regulatory_request *get_last_request(void)
{
return rcu_dereference_protected(last_request,
lockdep_is_held(&reg_mutex));
return rcu_dereference_check(last_request,
lockdep_is_held(&reg_mutex));
}
/* Used to queue up regulatory hints */
@ -2250,14 +2250,21 @@ int set_regdom(const struct ieee80211_regdomain *rd)
#ifdef CONFIG_HOTPLUG
int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
{
struct regulatory_request *lr = get_last_request();
struct regulatory_request *lr;
u8 alpha2[2];
bool add = false;
rcu_read_lock();
lr = get_last_request();
if (lr && !lr->processed) {
if (add_uevent_var(env, "COUNTRY=%c%c",
lr->alpha2[0], lr->alpha2[1]))
return -ENOMEM;
memcpy(alpha2, lr->alpha2, 2);
add = true;
}
rcu_read_unlock();
if (add)
return add_uevent_var(env, "COUNTRY=%c%c",
alpha2[0], alpha2[1]);
return 0;
}
#else