From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:55416 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751294AbdGQQwg (ORCPT ); Mon, 17 Jul 2017 12:52:36 -0400 Subject: Patch "virtio-net: serialize tx routine during reset" has been added to the 4.11-stable tree To: jasowang@redhat.com, davem@davemloft.net, gregkh@linuxfoundation.org, john.fastabend@gmail.com, jpmenil@gmail.com, mst@redhat.com, robert.mccabe@rockwellcollins.com Cc: , From: Date: Mon, 17 Jul 2017 18:52:02 +0200 Message-ID: <1500310322107179@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled virtio-net: serialize tx routine during reset to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: virtio-net-serialize-tx-routine-during-reset.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Mon Jul 17 18:47:09 CEST 2017 From: Jason Wang Date: Wed, 28 Jun 2017 09:51:03 +0800 Subject: virtio-net: serialize tx routine during reset From: Jason Wang [ Upstream commit 713a98d90c5ea072c1bb00ef40617aee2cef2232 ] 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 Acked-by: Robert McCabe Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/virtio_net.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1709,6 +1709,7 @@ static void virtnet_freeze_down(struct v 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)) { Patches currently in stable-queue which might be from jasowang@redhat.com are queue-4.11/virtio-net-serialize-tx-routine-during-reset.patch