From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 7 Nov 2012 13:02:30 +0000 (+0100)
Subject: mac80211: fix TX error path
X-Git-Tag: MMI-PSA29.97-13-9~15401^2~17^2^2~79
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c963bec3534b175eed6f216a9d6ed6f082fe740;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

mac80211: fix TX error path

One error path in ieee80211_subif_start_xmit() will
double-free the SKB. Set it to NULL to prevent that.

This issue was introduced by my channel context
changes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 065f81cb5618..b5468876287e 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2089,6 +2089,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
 		head_need = max_t(int, 0, head_need);
 		if (ieee80211_skb_resize(sdata, skb, head_need, true)) {
 			ieee80211_free_txskb(&local->hw, skb);
+			skb = NULL;
 			goto fail_rcu;
 		}
 	}