Commit 0b97a484 authored Sep 14, 2016 by Johannes Berg

mac80211: check skb_linearize() return value



The A-MSDU TX code (within TXQs) didn't always check the return value
of skb_linearize() properly, resulting in potentially passing a frag-
list SKB down to the driver even when it said it can't handle it. Fix
that.

Fixes: 6e0456b5 ("mac80211: add A-MSDU tx support")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent ad5987b4

net/mac80211/tx.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1515,8 +1515,12 @@ out:
		spin_unlock_bh(&fq->lock);

		if (skb && skb_has_frag_list(skb) &&
		!ieee80211_hw_check(&local->hw, TX_FRAG_LIST))
		skb_linearize(skb);
		!ieee80211_hw_check(&local->hw, TX_FRAG_LIST)) {
		if (skb_linearize(skb)) {
		ieee80211_free_txskb(&local->hw, skb);
		return NULL;
		}
		}

		return skb;
		}

Admin message