From: Johannes Berg Date: Thu, 12 Mar 2015 06:53:27 +0000 (+0200) Subject: nl80211: ignore HT/VHT capabilities without QoS/WMM X-Git-Tag: v3.4.108~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10b5044ed46fcc002fec8e9f11c45f1edd2a75ae;p=thirdparty%2Fkernel%2Fstable.git 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 [lizf: Backported to 3.4: - adjust context - 3.4 doesn't support VHT] Signed-off-by: Zefan Li --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 63c18079683ad..263cbd81bbe65 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: