lkml.org 
[lkml]   [2018]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 26/47] mac80211: dont parse encrypted management frames in ieee80211_frame_acked
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>


    [ Upstream commit cf147085fdda044622973a12e4e06f1c753ab677 ]

    ieee80211_frame_acked is called when a frame is acked by
    the peer. In case this is a management frame, we check
    if this an SMPS frame, in which case we can update our
    antenna configuration.

    When we parse the management frame we look at the category
    in case it is an action frame. That byte sits after the IV
    in case the frame was encrypted. This means that if the
    frame was encrypted, we basically look at the IV instead
    of looking at the category. It is then theorically
    possible that we think that an SMPS action frame was acked
    where really we had another frame that was encrypted.

    Since the only management frame whose ack needs to be
    tracked is the SMPS action frame, and that frame is not
    a robust management frame, it will never be encrypted.
    The easiest way to fix this problem is then to not look
    at frames that were encrypted.

    Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/mac80211/status.c | 1 +
    1 file changed, 1 insertion(+)

    --- a/net/mac80211/status.c
    +++ b/net/mac80211/status.c
    @@ -194,6 +194,7 @@ static void ieee80211_frame_acked(struct
    }

    if (ieee80211_is_action(mgmt->frame_control) &&
    + !ieee80211_has_protected(mgmt->frame_control) &&
    mgmt->u.action.category == WLAN_CATEGORY_HT &&
    mgmt->u.action.u.ht_smps.action == WLAN_HT_ACTION_SMPS &&
    ieee80211_sdata_running(sdata)) {

    \
     
     \ /
      Last update: 2018-03-23 11:19    [W:3.947 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site