summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2014-12-10 20:14:07 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-12-12 12:00:46 +0100
commit7e6225a1604d0c6aa4140289bf5761868ffc9c83 (patch)
tree74e1367f353301f9d712edc9882f04854f374fda /net/mac80211
parentr8169:update rtl8168g pcie ephy parameter (diff)
downloadlinux-7e6225a1604d0c6aa4140289bf5761868ffc9c83.tar.xz
linux-7e6225a1604d0c6aa4140289bf5761868ffc9c83.zip
mac80211: avoid using uninitialized stack data
Avoid a case where we would access uninitialized stack data if the AP advertises HT support without 40MHz channel support. Cc: stable@vger.kernel.org Fixes: f3000e1b43f1 ("mac80211: fix broken use of VHT/20Mhz with some APs") Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 75a9bf50207e..2c36c4765f47 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -174,6 +174,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,
if (!(ht_cap->cap_info &
cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40))) {
ret = IEEE80211_STA_DISABLE_40MHZ;
+ vht_chandef = *chandef;
goto out;
}