From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH net] virtio-net: serialize tx routine during reset Date: Wed, 28 Jun 2017 05:00:24 +0300 Message-ID: <20170628045956-mutt-send-email-mst@kernel.org> References: <1498614663-7711-1-git-send-email-jasowang@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1498614663-7711-1-git-send-email-jasowang@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Jason Wang Cc: netdev@vger.kernel.org, jpmenil@gmail.com, John Fastabend , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org List-Id: virtualization@lists.linuxfoundation.org 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 > Tested-by: Jean-Philippe Menil > Fixes commit f600b6905015 ("virtio_net: Add XDP support") > Cc: John Fastabend > Signed-off-by: Jason Wang Acked-by: Michael S. Tsirkin 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