mac80211: fix offchannel TX cookie matching

commit 28a1bcdb57d50f3038a255741ecc83e391e5282e upstream.

When I introduced in-kernel off-channel TX I
introduced a bug -- the work can't be canceled
again because the code clear the skb pointer.
Fix this by keeping track separately of whether
TX status has already been reported.

Reported-by: Jouni Malinen <j@w1.fi>
Tested-by: Jouni Malinen <j@w1.fi>
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>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 3d1b091d9b2ece8d632537a443867939db80706b..10c95be3b3020df0f116d34064d79df487b5f0e4 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1821,7 +1821,7 @@ ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb)
         * so in that case userspace will have to deal with it.
         */
 
-       if (wk->offchan_tx.wait && wk->offchan_tx.frame)
+       if (wk->offchan_tx.wait && !wk->offchan_tx.status)
                cfg80211_mgmt_tx_status(wk->sdata->dev,
                                        (unsigned long) wk->offchan_tx.frame,
                                        wk->ie, wk->ie_len, false, GFP_KERNEL);

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 400c09bea63904e933900b27c4dd244c41819b38..f5ff8870c4a07105ad933c7ed644d636b1d108ed 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -345,6 +345,7 @@ struct ieee80211_work {
                struct {
                        struct sk_buff *frame;
                        u32 wait;
+                       bool status;
                } offchan_tx;
        };
 

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 1658efaa2e8eef4b042ec05ffd875cbd0d3c6ec1..04cdbaf160ba7651a2a0b434fc0208c5aad587a3 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -336,7 +336,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                                continue;
                        if (wk->offchan_tx.frame != skb)
                                continue;
-                       wk->offchan_tx.frame = NULL;
+                       wk->offchan_tx.status = true;
                        break;
                }
                rcu_read_unlock();

diff --git a/net/mac80211/work.c b/net/mac80211/work.c
index 380b9a7462b67dc426fa875db3ccafa54b7fb87e..8042c40e56fefae54e7781c7b636708ce99651e8 100644 (file)
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
@@ -579,7 +579,7 @@ ieee80211_offchannel_tx(struct ieee80211_work *wk)
                /*
                 * After this, offchan_tx.frame remains but now is no
                 * longer a valid pointer -- we still need it as the
-                * cookie for canceling this work.
+                * cookie for canceling this work/status matching.
                 */
                ieee80211_tx_skb(wk->sdata, wk->offchan_tx.frame);