diff options
| author |   Jeremy Fitzhardinge <jeremy@goop.org> | 2007-08-13 12:54:37 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-08-14 01:51:09 -0400 |
| commit | 10a273a67343e1f317652d69b09a212ee0284b44 (patch) | |
| tree | 2eff99de733e5f4c53de2acf40d62e719bcf1291 /drivers/net/xen-netfront.c | |
| parent | 3c59x maintainer (diff) | |
| download | linux-dev-10a273a67343e1f317652d69b09a212ee0284b44.tar.xz linux-dev-10a273a67343e1f317652d69b09a212ee0284b44.zip | |
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 <keir@xensource.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 489f69c5d6ca..4445810335a8 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: |