Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753784AbdGSKJY (ORCPT ); Wed, 19 Jul 2017 06:09:24 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40650 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753630AbdGSKJV (ORCPT ); Wed, 19 Jul 2017 06:09:21 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jean-Philippe Menil , John Fastabend , Jason Wang , "Michael S. Tsirkin" , Robert McCabe , "David S. Miller" Subject: [PATCH 4.11 09/88] virtio-net: serialize tx routine during reset Date: Wed, 19 Jul 2017 12:07:31 +0200 Message-Id: <20170719100821.853125658@linuxfoundation.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719100820.364094938@linuxfoundation.org> References: <20170719100820.364094938@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1336 Lines: 39 4.11-stable review patch. If anyone has any objections, please let me know. ------------------ 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)) {