diff options
| author |   Jason Wang <jasowang@redhat.com> | 2017-06-28 09:51:03 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-29 12:51:59 -0400 |
| commit | 713a98d90c5ea072c1bb00ef40617aee2cef2232 (patch) | |
| tree | db93479ad5f5a93653fd59862d45744d7472ed12 /drivers/net/virtio_net.c | |
| parent | net: usb: asix88179_178a: Add support for the Belkin B2B128 (diff) | |
| download | linux-dev-713a98d90c5ea072c1bb00ef40617aee2cef2232.tar.xz linux-dev-713a98d90c5ea072c1bb00ef40617aee2cef2232.zip | |
virtio-net: serialize tx routine during reset
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>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a871f45ecc79..143d8a95a60d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -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)) { |