net: keep original skb which only needs header checking during software GSO
Subsystems (2)
PATCH v2 1/1 net: keep original skb which only needs header checking during software GSO
Commit ce93718fb7cdbc064c3000ff59e4d3200bdfa744 ("net: Don't keep around original SKB when we software segment GSO frames") frees the original skb after software GSO even for dodgy gso skbs. This breaks the stream throughput from untrusted sources, since only header checking was done during software GSO instead of a true segmentation. This patch fixes this by freeing the original gso skb only when it was really segmented by software.
Fixes ce93718fb7cdbc064c3000ff59e4d3200bdfa744 ("net: Don't keep around original SKB when we software segment GSO frames.")
---
Changes from V1:
- use consume_skb() instead of kfree_skb()
- fix coding style
--- net/core/dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/core/dev.c +5 -3
@@ -2694,10 +2694,12 @@ struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev)struct sk_buff *segs; segs =skb_gso_segment (skb, features); -kfree_skb (skb); -if (IS_ERR (segs)) +if (IS_ERR (segs)) { segs =NULL ; - skb = segs; + }else if (segs) { +consume_skb (skb); + skb = segs; + } }else {if (skb_needs_linearize (skb, features) &&__skb_linearize (skb))
Signature · 1 line
1.9.1
Quoted 8 lines · Jason Wang
Commit
ce93718fb7cdbc064c3000ff59e4d3200bdfa744("net: Don't keep around original SKB when we software segment GSO frames") frees the original skb after software GSO even for dodgy gso skbs. This breaks the stream throughput from untrusted sources, since only header checking was done during software GSO instead of a true segmentation. This patch fixes this by freeing the original gso skb only when it was really segmented by software.
Quoted 7 lines
Fixes
ce93718fb7cdbc064c3000ff59e4d3200bdfa744("net: Don't keep around original SKB when we software segment GSO frames.")Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>---
From: Jason Wang <[email protected]>
Date: Fri, 19 Sep 2014 16:04:38 +0800
Quoted 8 lines
Commit
ce93718fb7cdbc064c3000ff59e4d3200bdfa744("net: Don't keep around original SKB when we software segment GSO frames") frees the original skb after software GSO even for dodgy gso skbs. This breaks the stream throughput from untrusted sources, since only header checking was done during software GSO instead of a true segmentation. This patch fixes this by freeing the original gso skb only when it was really segmented by software.
Quoted 6 lines
Fixes
ce93718fb7cdbc064c3000ff59e4d3200bdfa744("net: Don't keep around original SKB when we software segment GSO frames.")Cc David S. Miller <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Jason Wang <[email protected]>
Applied, thanks Jeff.