From: Jeremy Fitzhardinge Date: Mon, 13 Aug 2007 19:54:37 +0000 (-0700) Subject: xen-netfront: Avoid deref'ing skbafter it is potentially freed. X-Git-Tag: v2.6.23-rc4~138^2~1 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=10a273a67343e1f317652d69b09a212ee0284b44;p=safe%2Fjmp%2Flinux-2.6 xen-netfront: Avoid deref'ing skbafter it is potentially freed. xennet_tx_bug_gc can free the skb before we use it, so make sure we don't. Signed-off-by: Keir Fraser Signed-off-by: Jeremy Fitzhardinge Cc: Jeff Garzik Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 489f69c..4445810 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -566,6 +566,10 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) if (notify) notify_remote_via_irq(np->netdev->irq); + np->stats.tx_bytes += skb->len; + np->stats.tx_packets++; + + /* Note: It is not safe to access skb after xennet_tx_buf_gc()! */ xennet_tx_buf_gc(dev); if (!netfront_tx_slot_available(np)) @@ -573,9 +577,6 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) spin_unlock_irq(&np->tx_lock); - np->stats.tx_bytes += skb->len; - np->stats.tx_packets++; - return 0; drop: