aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-03-20 23:53:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-03-27 20:13:07 -0400
commitcc0b6fe88e99096868bdbacbf486c97299533b5a (patch)
treeeffa5ad2561af91b9896970cd589f5bcba2e33d1 /net/wireless
parent2e097dc65673ed421bbc2e49f52c125aa43a8ee6 (diff)
cfg80211: fix incorrect assumption on last_request for 11d
The incorrect assumption is the last regulatory request (last_request) is always a country IE when processing country IEs. Although this is true 99% of the time the first time this happens this could not be true. This fixes an oops in the branch check for the last_request when accessing drv_last_ie. The access was done under the assumption the struct won't be null. Note to stable: to port to 29 replace as follows, only 29 has country IE code: s|NL80211_REGDOM_SET_BY_COUNTRY_IE|REGDOM_SET_BY_COUNTRY_IE Cc: stable@kernel.org Reported-by: Quentin Armitage <Quentin@armitage.org.uk> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index ead9dccb5475..9afc9168748b 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1601,6 +1601,10 @@ static bool reg_same_country_ie_hint(struct wiphy *wiphy,
1601 1601
1602 assert_cfg80211_lock(); 1602 assert_cfg80211_lock();
1603 1603
1604 if (unlikely(last_request->initiator !=
1605 NL80211_REGDOM_SET_BY_COUNTRY_IE))
1606 return false;
1607
1604 request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx); 1608 request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
1605 1609
1606 if (!request_wiphy) 1610 if (!request_wiphy)
@@ -1663,7 +1667,9 @@ void regulatory_hint_11d(struct wiphy *wiphy,
1663 * we optimize an early check to exit out early if we don't have to 1667 * we optimize an early check to exit out early if we don't have to
1664 * do anything 1668 * do anything
1665 */ 1669 */
1666 if (likely(wiphy_idx_valid(last_request->wiphy_idx))) { 1670 if (likely(last_request->initiator ==
1671 NL80211_REGDOM_SET_BY_COUNTRY_IE &&
1672 wiphy_idx_valid(last_request->wiphy_idx))) {
1667 struct cfg80211_registered_device *drv_last_ie; 1673 struct cfg80211_registered_device *drv_last_ie;
1668 1674
1669 drv_last_ie = 1675 drv_last_ie =