openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 3b79af973c ("mac80211: stop using pointers as userspace cookies")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-11-24 20:28:27 +01:00
parent 856142cdaa
commit e673a65952
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/offchannel.c
View File

@ -308,11 +308,10 @@ void ieee80211_roc_notify_destroy(struct ieee80211_roc_work *roc, bool free)
/* was never transmitted */ /* was never transmitted */
if (roc->frame) { if (roc->frame) {
cfg80211_mgmt_tx_status(&roc->sdata->wdev, cfg80211_mgmt_tx_status(&roc->sdata->wdev, roc->mgmt_tx_cookie,
(unsigned long)roc->frame,
roc->frame->data, roc->frame->len, roc->frame->data, roc->frame->len,
false, GFP_KERNEL); false, GFP_KERNEL);
kfree_skb(roc->frame); ieee80211_free_txskb(&roc->sdata->local->hw, roc->frame);
} }
if (!roc->mgmt_tx_cookie) if (!roc->mgmt_tx_cookie)