lkml.org 
[lkml]   [2018]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 16/40] mac80211: dont WARN on bad WMM parameters from buggy APs
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit c470bdc1aaf36669e04ba65faf1092b2d1c6cabe ]

    Apparently, some APs are buggy enough to send a zeroed
    WMM IE. Don't WARN on this since this is not caused by a bug
    on the client's system.

    This aligns the condition of the WARNING in drv_conf_tx
    with the validity check in ieee80211_sta_wmm_params.
    We will now pick the default values whenever we get
    a zeroed WMM IE.

    This has been reported here:
    https://bugzilla.kernel.org/show_bug.cgi?id=199161

    Fixes: f409079bb678 ("mac80211: sanity check CW_min/CW_max towards driver")
    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/mlme.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
    index a5e11280f405..51f31e77c19b 100644
    --- a/net/mac80211/mlme.c
    +++ b/net/mac80211/mlme.c
    @@ -1886,7 +1886,8 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local,
    params[ac].acm = acm;
    params[ac].uapsd = uapsd;

    - if (params[ac].cw_min > params[ac].cw_max) {
    + if (params->cw_min == 0 ||
    + params[ac].cw_min > params[ac].cw_max) {
    sdata_info(sdata,
    "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n",
    params[ac].cw_min, params[ac].cw_max, aci);
    --
    2.19.1


    \
     
     \ /
      Last update: 2018-12-20 10:45    [W:2.203 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site