| Message ID | 1411113878-11910-1-git-send-email-jasowang@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2014-09-19 at 16:04 +0800, Jason Wang wrote: > 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.") > > Cc: David S. Miller <davem@davemloft.net> > Cc: Eric Dumazet <eric.dumazet@gmail.com> > Signed-off-by: Jason Wang <jasowang@redhat.com> > --- Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jason Wang <jasowang@redhat.com> Date: Fri, 19 Sep 2014 16:04:38 +0800 > 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.") > > Cc: David S. Miller <davem@davemloft.net> > Cc: Eric Dumazet <eric.dumazet@gmail.com> > Signed-off-by: Jason Wang <jasowang@redhat.com> Applied, thanks Jeff. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/dev.c b/net/core/dev.c index e916ba8..52cd71a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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))
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.") Cc: David S. Miller <davem@davemloft.net> Cc: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Jason Wang <jasowang@redhat.com> --- 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(-)