Commit 2e66f55b authored by Krishna Kumar's avatar Krishna Kumar Committed by David S. Miller

virtio_net: Fix panic in virtnet_remove

Fix a panic in virtnet_remove. unregister_netdev has already
freed up the netdev (and virtnet_info) due to dev->destructor
being set, while virtnet_info is still required. Remove
virtnet_free altogether, and move the freeing of the per-cpu
statistics from virtnet_free to virtnet_remove.

Tested patch below.
Signed-off-by: default avatarKrishna Kumar <krkumar2@in.ibm.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87c48fa3
...@@ -705,14 +705,6 @@ static void virtnet_netpoll(struct net_device *dev) ...@@ -705,14 +705,6 @@ static void virtnet_netpoll(struct net_device *dev)
} }
#endif #endif
static void virtnet_free(struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
free_percpu(vi->stats);
free_netdev(dev);
}
static int virtnet_open(struct net_device *dev) static int virtnet_open(struct net_device *dev)
{ {
struct virtnet_info *vi = netdev_priv(dev); struct virtnet_info *vi = netdev_priv(dev);
...@@ -959,7 +951,6 @@ static int virtnet_probe(struct virtio_device *vdev) ...@@ -959,7 +951,6 @@ static int virtnet_probe(struct virtio_device *vdev)
/* Set up network device as normal. */ /* Set up network device as normal. */
dev->netdev_ops = &virtnet_netdev; dev->netdev_ops = &virtnet_netdev;
dev->features = NETIF_F_HIGHDMA; dev->features = NETIF_F_HIGHDMA;
dev->destructor = virtnet_free;
SET_ETHTOOL_OPS(dev, &virtnet_ethtool_ops); SET_ETHTOOL_OPS(dev, &virtnet_ethtool_ops);
SET_NETDEV_DEV(dev, &vdev->dev); SET_NETDEV_DEV(dev, &vdev->dev);
...@@ -1122,6 +1113,7 @@ static void __devexit virtnet_remove(struct virtio_device *vdev) ...@@ -1122,6 +1113,7 @@ static void __devexit virtnet_remove(struct virtio_device *vdev)
while (vi->pages) while (vi->pages)
__free_pages(get_a_page(vi, GFP_KERNEL), 0); __free_pages(get_a_page(vi, GFP_KERNEL), 0);
free_percpu(vi->stats);
free_netdev(vi->dev); free_netdev(vi->dev);
} }
......
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