diff options
author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-12-10 14:14:07 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-12-12 06:00:46 -0500 |
commit | 7e6225a1604d0c6aa4140289bf5761868ffc9c83 (patch) | |
tree | 74e1367f353301f9d712edc9882f04854f374fda /net | |
parent | 5fbea33740aeb948422d7b7e8aafbeac362264b2 (diff) |
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')
-rw-r--r-- | net/mac80211/mlme.c | 1 |
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, | |||
174 | if (!(ht_cap->cap_info & | 174 | if (!(ht_cap->cap_info & |
175 | cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40))) { | 175 | cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40))) { |
176 | ret = IEEE80211_STA_DISABLE_40MHZ; | 176 | ret = IEEE80211_STA_DISABLE_40MHZ; |
177 | vht_chandef = *chandef; | ||
177 | goto out; | 178 | goto out; |
178 | } | 179 | } |
179 | 180 | ||