Commit 9f3ef3d7 authored Jan 13, 2020 by Jason A. Donenfeld Committed by David S. Miller Jan 14, 2020

net: mac80211: use skb_list_walk_safe helper for gso segments

This is a conversion case for the new function, keeping the flow of the
existing code as intact as possible. We also switch over to using
skb_mark_not_on_list instead of a null write to skb->next.

Finally, this code appeared to have a memory leak in the case where
header building fails before the last gso segment. In that case, the
remaining segments are not freed. So this commit also adds the proper
kfree_skb_list call for the remainder of the skbs.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2670ee77

net/mac80211/tx.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -3949,18 +3949,15 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
		}
		}

		next = skb;
		while (next) {
		skb = next;
		next = skb->next;

		skb->prev = NULL;
		skb->next = NULL;
		skb_list_walk_safe(skb, skb, next) {
		skb_mark_not_on_list(skb);

		skb = ieee80211_build_hdr(sdata, skb, info_flags,
		sta, ctrl_flags);
		if (IS_ERR(skb))
		if (IS_ERR(skb)) {
		kfree_skb_list(next);
		goto out;
		}

		ieee80211_tx_stats(dev, skb->len);

Admin message