nl80211: ignore HT/VHT capabilities without QoS/WMM
commit 496fcc294d
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>
This commit is contained in:
parent
5262307d9f
commit
25a9b87706
|
@ -4190,6 +4190,16 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
|
||||||
if (parse_station_flags(info, dev->ieee80211_ptr->iftype, ¶ms))
|
if (parse_station_flags(info, dev->ieee80211_ptr->iftype, ¶ms))
|
||||||
return -EINVAL;
|
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 */
|
/* When you run into this, adjust the code below for the new flag */
|
||||||
BUILD_BUG_ON(NL80211_STA_FLAG_MAX != 7);
|
BUILD_BUG_ON(NL80211_STA_FLAG_MAX != 7);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue