mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

cfg80211: reg: fix reg_call_crda() return value bug

Browse source 
The function reg_call_crda() can't actually validly return
REG_REQ_IGNORE as it does now when calling CRDA fails since
that return value isn't handled properly. Fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-10-15 12:05:05 +02:00
parent 7cf3741823
commit 25b20dbdc4
1 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
net/wireless/reg.c
View file

@ -554,15 +554,14 @@ static int call_crda(const char *alpha2)
return kobject_uevent_env(&reg_pdev->dev.kobj, KOBJ_CHANGE, env); return kobject_uevent_env(&reg_pdev->dev.kobj, KOBJ_CHANGE, env);
} }
static enum reg_request_treatment static bool reg_call_crda(struct regulatory_request *request)
reg_call_crda(struct regulatory_request *request)
{ {
if (call_crda(request->alpha2)) if (call_crda(request->alpha2))
return REG_REQ_IGNORE; return false;
queue_delayed_work(system_power_efficient_wq, queue_delayed_work(system_power_efficient_wq,
&reg_timeout, msecs_to_jiffies(3142)); &reg_timeout, msecs_to_jiffies(3142));
return REG_REQ_OK; return true;
} }
bool reg_is_valid_request(const char *alpha2) bool reg_is_valid_request(const char *alpha2)
@ -1855,19 +1854,14 @@ static void reg_set_request_processed(void)
* *
* The wireless subsystem can use this function to process * The wireless subsystem can use this function to process
* a regulatory request issued by the regulatory core. * a regulatory request issued by the regulatory core.
*
* Returns one of the different reg request treatment values.
*/ */
static enum reg_request_treatment static void reg_process_hint_core(struct regulatory_request *core_request)
reg_process_hint_core(struct regulatory_request *core_request)
{ {
if (reg_call_crda(core_request)) {
core_request->intersect = false; core_request->intersect = false;
core_request->processed = false; core_request->processed = false;
reg_update_last_request(core_request);
reg_update_last_request(core_request); }
return reg_call_crda(core_request);
} }
static enum reg_request_treatment static enum reg_request_treatment
@ -1912,11 +1906,8 @@ __reg_process_hint_user(struct regulatory_request *user_request)
* *
* The wireless subsystem can use this function to process * The wireless subsystem can use this function to process
* a regulatory request initiated by userspace. * a regulatory request initiated by userspace.
*
* Returns one of the different reg request treatment values.
*/ */
static enum reg_request_treatment static void reg_process_hint_user(struct regulatory_request *user_request)
reg_process_hint_user(struct regulatory_request *user_request)
{ {
enum reg_request_treatment treatment; enum reg_request_treatment treatment;
@ -1924,18 +1915,19 @@ reg_process_hint_user(struct regulatory_request *user_request)
if (treatment == REG_REQ_IGNORE || if (treatment == REG_REQ_IGNORE ||
treatment == REG_REQ_ALREADY_SET) { treatment == REG_REQ_ALREADY_SET) {
reg_free_request(user_request); reg_free_request(user_request);
return treatment; return;
} }
user_request->intersect = treatment == REG_REQ_INTERSECT; user_request->intersect = treatment == REG_REQ_INTERSECT;
user_request->processed = false; user_request->processed = false;
reg_update_last_request(user_request); if (reg_call_crda(user_request)) {
reg_update_last_request(user_request);
user_alpha2[0] = user_request->alpha2[0]; user_alpha2[0] = user_request->alpha2[0];
user_alpha2[1] = user_request->alpha2[1]; user_alpha2[1] = user_request->alpha2[1];
} else {
return reg_call_crda(user_request); reg_free_request(user_request);
}
} }
static enum reg_request_treatment static enum reg_request_treatment
@ -2003,8 +1995,6 @@ reg_process_hint_driver(struct wiphy *wiphy,
driver_request->intersect = treatment == REG_REQ_INTERSECT; driver_request->intersect = treatment == REG_REQ_INTERSECT;
driver_request->processed = false; driver_request->processed = false;
reg_update_last_request(driver_request);
/* /*
* Since CRDA will not be called in this case as we already * Since CRDA will not be called in this case as we already
* have applied the requested regulatory domain before we just * have applied the requested regulatory domain before we just
@ -2012,11 +2002,17 @@ reg_process_hint_driver(struct wiphy *wiphy,
*/ */
if (treatment == REG_REQ_ALREADY_SET) { if (treatment == REG_REQ_ALREADY_SET) {
nl80211_send_reg_change_event(driver_request); nl80211_send_reg_change_event(driver_request);
reg_update_last_request(driver_request);
reg_set_request_processed(); reg_set_request_processed();
return treatment; return treatment;
} }
return reg_call_crda(driver_request); if (reg_call_crda(driver_request))
reg_update_last_request(driver_request);
else
reg_free_request(driver_request);
return REG_REQ_OK;
} }
static enum reg_request_treatment static enum reg_request_treatment
@ -2099,9 +2095,12 @@ reg_process_hint_country_ie(struct wiphy *wiphy,
country_ie_request->intersect = false; country_ie_request->intersect = false;
country_ie_request->processed = false; country_ie_request->processed = false;
reg_update_last_request(country_ie_request); if (reg_call_crda(country_ie_request))
reg_update_last_request(country_ie_request);
else
reg_free_request(country_ie_request);
return reg_call_crda(country_ie_request); return REG_REQ_OK;
} }
/* This processes *all* regulatory hints */ /* This processes *all* regulatory hints */