redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
alistair/sensors
Jason A. Donenfeld 2020-01-13 18:42:33 -05:00 committed by David S. Miller
parent 2670ee77c9
commit 9f3ef3d702
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/mac80211/tx.c
View File

@ -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);