lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[055/289] mac80211: use correct station flags lock
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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

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

    commit f5521b13880f4f4f612e1d20dd4f565122d16e04 upstream.

    This code is modifying the station flags, and
    as such should hold the flags lock so it can
    do so atomically vs. other flags modifications
    and readers. This issue was introduced when
    this code was added in eccb8e8f, as it used
    the wrong lock (thus not fixing the race that
    was previously documented in a comment.)

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/mac80211/cfg.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -634,6 +634,7 @@ static void sta_apply_parameters(struct
    struct sta_info *sta,
    struct station_parameters *params)
    {
    + unsigned long flags;
    u32 rates;
    int i, j;
    struct ieee80211_supported_band *sband;
    @@ -642,7 +643,7 @@ static void sta_apply_parameters(struct

    sband = local->hw.wiphy->bands[local->oper_channel->band];

    - spin_lock_bh(&sta->lock);
    + spin_lock_irqsave(&sta->flaglock, flags);
    mask = params->sta_flags_mask;
    set = params->sta_flags_set;

    @@ -669,7 +670,7 @@ static void sta_apply_parameters(struct
    if (set & BIT(NL80211_STA_FLAG_MFP))
    sta->flags |= WLAN_STA_MFP;
    }
    - spin_unlock_bh(&sta->lock);
    + spin_unlock_irqrestore(&sta->flaglock, flags);

    /*
    * cfg80211 validates this (1-2007) and allows setting the AID



    \
     
     \ /
      Last update: 2010-12-08 02:03    [W:0.021 / U:60.932 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site