* [PATCH net] virtio-net: serialize tx routine during reset
@ 2017-06-28 1:51 ` Jason Wang
0 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2017-06-28 1:51 UTC (permalink / raw)
To: mst, virtualization, netdev, linux-kernel; +Cc: John Fastabend, jpmenil
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net] virtio-net: serialize tx routine during reset
@ 2017-06-28 1:51 ` Jason Wang
0 siblings, 0 replies; 7+ messages in thread
From: Jason Wang @ 2017-06-28 1:51 UTC (permalink / raw)
To: mst, virtualization, netdev, linux-kernel
Cc: jpmenil, Jason Wang, John Fastabend
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net] virtio-net: serialize tx routine during reset
2017-06-28 1:51 ` Jason Wang
@ 2017-06-28 2:00 ` Michael S. Tsirkin
-1 siblings, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2017-06-28 2:00 UTC (permalink / raw)
To: Jason Wang; +Cc: netdev, jpmenil, John Fastabend, linux-kernel, virtualization
On Wed, Jun 28, 2017 at 09:51:03AM +0800, Jason Wang wrote:
> 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>
Thanks a lot Jason. I think this is needed in stable as well.
> ---
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH net] virtio-net: serialize tx routine during reset
@ 2017-06-28 2:00 ` Michael S. Tsirkin
0 siblings, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2017-06-28 2:00 UTC (permalink / raw)
To: Jason Wang; +Cc: virtualization, netdev, linux-kernel, jpmenil, John Fastabend
On Wed, Jun 28, 2017 at 09:51:03AM +0800, Jason Wang wrote:
> 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>
Thanks a lot Jason. I think this is needed in stable as well.
> ---
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [net] virtio-net: serialize tx routine during reset
2017-06-28 1:51 ` Jason Wang
(?)
(?)
@ 2017-06-28 3:02 ` McCabe, Robert J
-1 siblings, 0 replies; 7+ messages in thread
From: McCabe, Robert J @ 2017-06-28 3:02 UTC (permalink / raw)
To: netdev
Acked-by: Robert McCabe <robert.mccabe@rockwellcollins.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net] virtio-net: serialize tx routine during reset
2017-06-28 1:51 ` Jason Wang
@ 2017-06-29 16:52 ` David Miller
-1 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-06-29 16:52 UTC (permalink / raw)
To: jasowang; +Cc: mst, netdev, john.fastabend, linux-kernel, virtualization,
jpmenil
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 28 Jun 2017 09:51:03 +0800
> 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>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH net] virtio-net: serialize tx routine during reset
@ 2017-06-29 16:52 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-06-29 16:52 UTC (permalink / raw)
To: jasowang; +Cc: mst, virtualization, netdev, linux-kernel, jpmenil,
john.fastabend
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 28 Jun 2017 09:51:03 +0800
> 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>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-29 16:52 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-28 1:51 [PATCH net] virtio-net: serialize tx routine during reset Jason Wang
2017-06-28 1:51 ` Jason Wang
2017-06-28 2:00 ` Michael S. Tsirkin
2017-06-28 2:00 ` Michael S. Tsirkin
2017-06-28 3:02 ` [net] " McCabe, Robert J
2017-06-29 16:52 ` [PATCH net] " David Miller
2017-06-29 16:52 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.