mac80211: fix mgmt-tx abort cookie and leak (e673a659) · Commits · 戴 / test

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: ("mac80211: stop using pointers as userspace cookies") Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/offchannel.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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)

Admin message