Rusty Russell
2008-Jun-16 04:41 UTC
[PATCH] virtio_net: Fix skb->csum_start computation (2.6.24, 2.6.25)
From: Mark McLoughlin <markmc at redhat.com> hdr->csum_start is the offset from the start of the ethernet header to the transport layer checksum field. skb->csum_start is the offset from skb->head. skb_partial_csum_set() assumes that skb->data points to the ethernet header - i.e. it computes skb->csum_start by adding the headroom to hdr->csum_start. Since eth_type_trans() skb_pull()s the ethernet header, skb_partial_csum_set() should be called before eth_type_trans(). (Without this patch, GSO packets from a guest to the world outside the host are corrupted). Signed-off-by: Mark McLoughlin <markmc at redhat.com> Acked-by: Herbert Xu <herbert at gondor.apana.org.au> Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> --- drivers/net/virtio_net.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 50e6e59..503486f 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -86,9 +86,7 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, BUG_ON(len > MAX_PACKET_LEN); skb_trim(skb, len); - skb->protocol = eth_type_trans(skb, dev); - pr_debug("Receiving skb proto 0x%04x len %i type %i\n", - ntohs(skb->protocol), skb->len, skb->pkt_type); + dev->stats.rx_bytes += skb->len; dev->stats.rx_packets++; @@ -98,6 +96,10 @@ static void receive_skb(struct net_device *dev, struct sk_buff *skb, goto frame_err; } + skb->protocol = eth_type_trans(skb, dev); + pr_debug("Receiving skb proto 0x%04x len %i type %i\n", + ntohs(skb->protocol), skb->len, skb->pkt_type); + if (hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) { pr_debug("GSO!\n"); switch (hdr->gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {
Greg KH
2008-Jun-16 19:38 UTC
[stable] [PATCH] virtio_net: Fix skb->csum_start computation (2.6.24, 2.6.25)
On Mon, Jun 16, 2008 at 02:41:41PM +1000, Rusty Russell wrote:> From: Mark McLoughlin <markmc at redhat.com> > > hdr->csum_start is the offset from the start of the ethernet > header to the transport layer checksum field. skb->csum_start > is the offset from skb->head. > > skb_partial_csum_set() assumes that skb->data points to the > ethernet header - i.e. it computes skb->csum_start by adding > the headroom to hdr->csum_start. > > Since eth_type_trans() skb_pull()s the ethernet header, > skb_partial_csum_set() should be called before > eth_type_trans(). > > (Without this patch, GSO packets from a guest to the world outside the > host are corrupted).Is this in Linus's tree already? If so, what is the commit id. If not, we need a good reason to be able to take it into the -stable tree (note that 2.6.24 isn't being maintained anymore...) thanks, greg k-h
Possibly Parallel Threads
- [PATCH] virtio_net: Fix skb->csum_start computation (2.6.24, 2.6.25)
- [PATCH 1/4] virtio_net: Fix skb->csum_start computation
- [patch 05/15] virtio_net: Fix skb->csum_start computation
- [PATCH 3/3] virtio_net: Fix skb->csum_start computation
- [PATCH 3/3] virtio_net: Fix skb->csum_start computation