Commit 278b2513 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller

gso: Stop fraglists from escaping

As it stands skb fraglists can get past the check in dev_queue_xmit
if the skb is marked as GSO.  In particular, if the packet doesn't
have the proper checksums for GSO, but can otherwise be handled by
the underlying device, we will not perform the fraglist check on it
at all.

If the underlying device cannot handle fraglists, then this will
break.

The fix is as simple as moving the fraglist check from the device
check into skb_gso_ok.

This has caused crashes with Xen when used together with GRO which
can generate GSO packets with fraglists.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56c8f140
...@@ -1903,15 +1903,14 @@ static inline int net_gso_ok(int features, int gso_type) ...@@ -1903,15 +1903,14 @@ static inline int net_gso_ok(int features, int gso_type)
static inline int skb_gso_ok(struct sk_buff *skb, int features) static inline int skb_gso_ok(struct sk_buff *skb, int features)
{ {
return net_gso_ok(features, skb_shinfo(skb)->gso_type); return net_gso_ok(features, skb_shinfo(skb)->gso_type) &&
(!skb_shinfo(skb)->frag_list || (features & NETIF_F_FRAGLIST));
} }
static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
{ {
return skb_is_gso(skb) && return skb_is_gso(skb) &&
(!skb_gso_ok(skb, dev->features) || (!skb_gso_ok(skb, dev->features) ||
(skb_shinfo(skb)->frag_list &&
!(dev->features & NETIF_F_FRAGLIST)) ||
unlikely(skb->ip_summed != CHECKSUM_PARTIAL)); unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment