From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 3E99A567F for ; Tue, 2 May 2017 11:36:28 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 02:36:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,404,1488873600"; d="scan'208";a="1163483144" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by fmsmga002.fm.intel.com with ESMTP; 02 May 2017 02:36:27 -0700 From: Yuanhan Liu To: Huanle Han Cc: Yuanhan Liu , dpdk stable Date: Tue, 2 May 2017 17:32:12 +0800 Message-Id: <1493717548-12434-11-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1493717548-12434-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1493717548-12434-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-stable] patch 'net/virtio: fix crash when closing twice' has been queued to LTS release 16.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2017 09:36:28 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/07/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 807a533c3bcb5087c09591d85f7d4833a476f4fd Mon Sep 17 00:00:00 2001 From: Huanle Han Date: Mon, 20 Feb 2017 22:04:46 +0800 Subject: [PATCH] net/virtio: fix crash when closing twice [ upstream commit 0e78cfddc0851a0a12da0257758fe011ec507495 ] This commit fixs segment fault when rte_eth_dev_close() is called on a virtio dev more than once. Assigning zero after free to avoids freed memory to be accessed again. Fixes: 69c80d4ef89b ("net/virtio: allocate queue at init stage") Signed-off-by: Huanle Han Acked-by: Yuanhan Liu --- drivers/net/virtio/virtio_ethdev.c | 5 +++++ lib/librte_ether/rte_ethdev.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index d430093..452ad2a 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -545,6 +545,9 @@ virtio_free_queues(struct virtio_hw *hw) int queue_type; uint16_t i; + if (hw->vqs == NULL) + return; + for (i = 0; i < nr_vq; i++) { vq = hw->vqs[i]; if (!vq) @@ -563,9 +566,11 @@ virtio_free_queues(struct virtio_hw *hw) } rte_free(vq); + hw->vqs[i] = NULL; } rte_free(hw->vqs); + hw->vqs = NULL; } static int diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 5a31759..ea54525 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1051,8 +1051,10 @@ rte_eth_dev_close(uint8_t port_id) dev->data->dev_started = 0; (*dev->dev_ops->dev_close)(dev); + dev->data->nb_rx_queues = 0; rte_free(dev->data->rx_queues); dev->data->rx_queues = NULL; + dev->data->nb_tx_queues = 0; rte_free(dev->data->tx_queues); dev->data->tx_queues = NULL; } -- 1.9.0