From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753687AbdF1CAa (ORCPT ); Tue, 27 Jun 2017 22:00:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49822 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633AbdF1CA0 (ORCPT ); Tue, 27 Jun 2017 22:00:26 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B3323C056789 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B3323C056789 Date: Wed, 28 Jun 2017 05:00:24 +0300 From: "Michael S. Tsirkin" To: Jason Wang Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jpmenil@gmail.com, John Fastabend Subject: Re: [PATCH net] virtio-net: serialize tx routine during reset 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-Disposition: inline In-Reply-To: <1498614663-7711-1-git-send-email-jasowang@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 28 Jun 2017 02:00:25 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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