lkml.org 
[lkml]   [2014]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 069/121] mac80211: move roc cookie assignment earlier
    Date
    3.11.10.5 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Eliad Peller <eliad@wizery.com>

    commit 2f617435c3a6fe3f39efb9ae2baa77de2d6c97b8 upstream.

    ieee80211_start_roc_work() might add a new roc
    to existing roc, and tell cfg80211 it has already
    started.

    However, this might happen before the roc cookie
    was set, resulting in REMAIN_ON_CHANNEL (started)
    event with null cookie. Consequently, it can make
    wpa_supplicant go out of sync.

    Fix it by setting the roc cookie earlier.

    Signed-off-by: Eliad Peller <eliad@wizery.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/mac80211/cfg.c | 36 ++++++++++++++++++------------------
    1 file changed, 18 insertions(+), 18 deletions(-)

    diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
    index 98871d7..2116285 100644
    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -2494,6 +2494,24 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
    INIT_DELAYED_WORK(&roc->work, ieee80211_sw_roc_work);
    INIT_LIST_HEAD(&roc->dependents);

    + /*
    + * cookie is either the roc cookie (for normal roc)
    + * or the SKB (for mgmt TX)
    + */
    + if (!txskb) {
    + /* local->mtx protects this */
    + local->roc_cookie_counter++;
    + roc->cookie = local->roc_cookie_counter;
    + /* wow, you wrapped 64 bits ... more likely a bug */
    + if (WARN_ON(roc->cookie == 0)) {
    + roc->cookie = 1;
    + local->roc_cookie_counter++;
    + }
    + *cookie = roc->cookie;
    + } else {
    + *cookie = (unsigned long)txskb;
    + }
    +
    /* if there's one pending or we're scanning, queue this one */
    if (!list_empty(&local->roc_list) ||
    local->scanning || local->radar_detect_enabled)
    @@ -2628,24 +2646,6 @@ static int ieee80211_start_roc_work(struct ieee80211_local *local,
    if (!queued)
    list_add_tail(&roc->list, &local->roc_list);

    - /*
    - * cookie is either the roc cookie (for normal roc)
    - * or the SKB (for mgmt TX)
    - */
    - if (!txskb) {
    - /* local->mtx protects this */
    - local->roc_cookie_counter++;
    - roc->cookie = local->roc_cookie_counter;
    - /* wow, you wrapped 64 bits ... more likely a bug */
    - if (WARN_ON(roc->cookie == 0)) {
    - roc->cookie = 1;
    - local->roc_cookie_counter++;
    - }
    - *cookie = roc->cookie;
    - } else {
    - *cookie = (unsigned long)txskb;
    - }
    -
    return 0;
    }

    --
    1.9.0


    \
     
     \ /
      Last update: 2014-02-21 15:21    [W:4.175 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site