[PATCH net] virtio-net: serialize tx routine during reset

From	Jason Wang <jasowang@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH net] virtio-net: serialize tx routine during reset
Date	2017-06-28 04:00 +0200
Message-ID	<tXaqR-ld-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 drivers/net/virtio_net.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index a871f45..143d8a9 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)) {
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net] virtio-net: serialize tx routine during reset Jason Wang <jasowang@redhat.com> - 2017-06-28 04:00 +0200
  Re: [PATCH net] virtio-net: serialize tx routine during reset "Michael S. Tsirkin" <mst@redhat.com> - 2017-06-28 04:10 +0200
  Re: [PATCH net] virtio-net: serialize tx routine during reset David Miller <davem@davemloft.net> - 2017-06-29 19:00 +0200

csiph-web