diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-03-12 08:53:27 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:30 +0100 |
| commit | fd78d926566a189d7c12c1e1bf79851b7ff7a669 (patch) | |
| tree | 5c4131364c81bf0bf575de27f8f3eca0621fb248 /net | |
| parent | 217e17258ab5f5540aef2769c78ff6b3e2b08dde (diff) | |
| download | lwn-fd78d926566a189d7c12c1e1bf79851b7ff7a669.tar.gz lwn-fd78d926566a189d7c12c1e1bf79851b7ff7a669.zip | |
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>
[bwh: Backported to 3.2:
- Adjust context
- VHT is not supported]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 cb4168e1e7b2..e1f73b65af15 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2650,6 +2650,14 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) if (parse_station_flags(info, ¶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; + /* parse WME attributes if sta is WME capable */ if ((rdev->wiphy.flags & WIPHY_FLAG_AP_UAPSD) && (params.sta_flags_set & BIT(NL80211_STA_FLAG_WME)) && |