diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-05-13 17:04:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-20 14:46:32 -0400 |
commit | 61405e97788b1bc4e7c5be5b4ec04a73fc11bac2 (patch) | |
tree | 468b4283c9b7b42ccd3423ab1e3ed25cb4dc16a5 /net/wireless/reg.c | |
parent | d0e18f833d23afefb6751a21d14a2cd71d2d4d66 (diff) |
cfg80211: fix in nl80211_set_reg()
There is a race on access to last_request and its alpha2
through reg_is_valid_request() and us possibly processing
first another regulatory request on another CPU. We avoid
this improbably race by locking with the cfg80211_mutex as
we should have done in the first place. While at it add
the assert on locking on reg_is_valid_request().
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 48db569d4c6b..8d176a8010ba 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -382,6 +382,8 @@ static int call_crda(const char *alpha2) | |||
382 | /* Used by nl80211 before kmalloc'ing our regulatory domain */ | 382 | /* Used by nl80211 before kmalloc'ing our regulatory domain */ |
383 | bool reg_is_valid_request(const char *alpha2) | 383 | bool reg_is_valid_request(const char *alpha2) |
384 | { | 384 | { |
385 | assert_cfg80211_lock(); | ||
386 | |||
385 | if (!last_request) | 387 | if (!last_request) |
386 | return false; | 388 | return false; |
387 | 389 | ||