diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-03-12 08:53:27 +0200 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 11:40:28 +0800 |
| commit | 10b5044ed46fcc002fec8e9f11c45f1edd2a75ae (patch) | |
| tree | 243b50a32bc5e2919d118da1754ce9203fc265c6 /net | |
| parent | c87f72368ab73d50e88f6ef8b686a0f47d1398fe (diff) | |
nl80211: ignore HT/VHT capabilities without QoS/WMM
commit 496fcc294daab18799e190c0264863d653588d1f upstream.
As HT/VHT depend heavily on QoS/WMM, it's not a good idea to
let userspace add clients that have HT/VHT but not QoS/WMM.
Since it does so in certain cases we've observed (client is
using HT IEs but not QoS/WMM) just ignore the HT/VHT info at
this point and don't pass it down to the drivers which might
unconditionally use it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
[lizf: Backported to 3.4:
- adjust context
- 3.4 doesn't support VHT]
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/nl80211.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 63c18079683a..263cbd81bbe6 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2810,6 +2810,14 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) if (parse_station_flags(info, dev->ieee80211_ptr->iftype, ¶ms)) return -EINVAL; + /* HT requires QoS, but if we don't have that just ignore HT/VHT + * as userspace might just pass through the capabilities from the IEs + * directly, rather than enforcing this restriction and returning an + * error in this case. + */ + if (!(params.sta_flags_set & BIT(NL80211_STA_FLAG_WME))) + params.ht_capa = NULL; + switch (dev->ieee80211_ptr->iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP_VLAN: |