diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2015-11-24 20:28:27 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-12-04 14:43:32 +0100 |
| commit | e673a65952b4ab045a3e3eb200fdf408004fb4fd (patch) | |
| tree | 7a6a39d644b63949cc7adc18342d12fd309c0b7e | |
| parent | mac80211: catch queue stop underflow (diff) | |
| download | linux-dev-e673a65952b4ab045a3e3eb200fdf408004fb4fd.tar.xz linux-dev-e673a65952b4ab045a3e3eb200fdf408004fb4fd.zip | |
mac80211: fix mgmt-tx abort cookie and leak
If a mgmt-tx operation is aborted before it runs, the wrong
cookie is reported back to userspace, and the ack_skb gets
leaked since the frame is freed directly instead of freeing
it using ieee80211_free_txskb(). Fix that.
Fixes: 3b79af973cf4 ("mac80211: stop using pointers as userspace cookies")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/offchannel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 04401037140e..0fe9f746cd7e 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -308,11 +308,10 @@ void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free) /* was never transmitted */ if (roc->frame) { - cfg80211_mgmt_tx_status(&roc->sdata->wdev, - (unsigned long)roc->frame, + cfg80211_mgmt_tx_status(&roc->sdata->wdev, roc->mgmt_tx_cookie, roc->frame->data, roc->frame->len, false, GFP_KERNEL); - kfree_skb(roc->frame); + ieee80211_free_txskb(&roc->sdata->local->hw, roc->frame); } if (!roc->mgmt_tx_cookie) |