path: root/net
diff options
authorJohannes Berg <johannes.berg@intel.com>2015-03-12 08:53:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-13 14:02:11 +0200
commit9de9cea31095afa68b5eaa3030c4a2969a59e963 (patch)
treefd6aa1db96243d336ea5e12966d195604376b572 /net
parent7a882133b181058ba7851e302ec218a896695c55 (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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
1 files changed, 10 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index dc200bf831ae..90a0e552cb32 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4032,6 +4032,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
if (parse_station_flags(info, dev->ieee80211_ptr->iftype, &params))
return -EINVAL;
+ /* HT/VHT 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;
+ params.vht_capa = NULL;
+ }
/* When you run into this, adjust the code below for the new flag */