diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-05-31 18:24:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:50:07 -0700 |
| commit | eebd7ca1029a0d253bbc94544ca887fdb05d0b55 (patch) | |
| tree | 730ee339097477329c6490b1c32b19f5be36c698 | |
| parent | e58e8373ccdc6ef164009b814d0791705c0d3394 (diff) | |
| download | lwn-eebd7ca1029a0d253bbc94544ca887fdb05d0b55.tar.gz lwn-eebd7ca1029a0d253bbc94544ca887fdb05d0b55.zip | |
cfg80211: fix for duplicate userspace replies
commit 729e9c7663190d71fe5e29831634df80f38199c1 upstream.
This fixes an incorrect assumption (BUG_ON) made in
cfg80211 when handling country IE regulatory requests.
The assumption was that we won't try to call_crda()
twice for the same event and therefore we will not
recieve two replies through nl80211 for the regulatory
request. As it turns out it is true we don't call_crda()
twice for the same event, however, kobject_uevent_env()
*might* send the udev event twice and/or userspace can
simply process the udev event twice. We remove the BUG_ON()
and simply ignore the duplicate request.
For details refer to this thread:
http://marc.info/?l=linux-wireless&m=124149987921337&w=2
Reported-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/wireless/reg.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 487cb627ddba..d3ac70551ce2 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2042,7 +2042,13 @@ static int __set_regdom(const struct ieee80211_regdomain *rd) * the country IE rd with what CRDA believes that country should have */ - BUG_ON(!country_ie_regdomain); + /* + * Userspace could have sent two replies with only + * one kernel request. By the second reply we would have + * already processed and consumed the country_ie_regdomain. + */ + if (!country_ie_regdomain) + return -EALREADY; BUG_ON(rd == country_ie_regdomain); /* |