lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 055/144] nl80211: ignore HT/VHT capabilities without QoS/WMM
    Date
    3.16.7-ckt10 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johannes Berg <johannes.berg@intel.com>

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/wireless/nl80211.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
    index be4ba21df4d8..d316a9568238 100644
    --- a/net/wireless/nl80211.c
    +++ b/net/wireless/nl80211.c
    @@ -4266,6 +4266,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 */
    BUILD_BUG_ON(NL80211_STA_FLAG_MAX != 7);


    \
     
     \ /
      Last update: 2015-04-21 17:41    [W:4.042 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site