]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
virtio-net: serialize tx routine during reset
authorJason Wang <jasowang@redhat.com>
Wed, 28 Jun 2017 01:51:03 +0000 (09:51 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Jun 2017 16:51:59 +0000 (12:51 -0400)
We don't hold any tx lock when trying to disable TX during reset, this
would lead a use after free since ndo_start_xmit() tries to access
the virtqueue which has already been freed. Fix this by using
netif_tx_disable() before freeing the vqs, this could make sure no tx
after vq freeing.

Reported-by: Jean-Philippe Menil <jpmenil@gmail.com>
Tested-by: Jean-Philippe Menil <jpmenil@gmail.com>
Fixes commit f600b6905015 ("virtio_net: Add XDP support")
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Robert McCabe <robert.mccabe@rockwellcollins.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index a871f45ecc79a438b2b43465d3719f240ff25cb5..143d8a95a60d97b9036cd092d15b0bd8f8e361f8 100644 (file)
@@ -1797,6 +1797,7 @@ static void virtnet_freeze_down(struct virtio_device *vdev)
        flush_work(&vi->config_work);
 
        netif_device_detach(vi->dev);
+       netif_tx_disable(vi->dev);
        cancel_delayed_work_sync(&vi->refill);
 
        if (netif_running(vi->dev)) {