From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A70B71B119 for ; Wed, 21 Nov 2018 17:06:14 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 104878762D; Wed, 21 Nov 2018 16:06:14 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF03060A9C; Wed, 21 Nov 2018 16:06:12 +0000 (UTC) From: Kevin Traynor To: Igor Romanov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:04:09 +0000 Message-Id: <20181121160440.9014-19-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 21 Nov 2018 16:06:14 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc: fix a Tx queue double release possibility' has been queued to stable release 18.08.1 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: Wed, 21 Nov 2018 16:06:15 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From b6f3cc25414269b602e221c2486448934f71bd01 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Fri, 14 Sep 2018 08:31:36 +0100 Subject: [PATCH] net/sfc: fix a Tx queue double release possibility [ upstream commit 5d138ef92d47b34af589e49f505fb1bf6db5f09b ] There are two function that call sfc_tx_qfini(): sfc_tx_fini_queues() and sfc_tx_queue_release(). But only sfc_tx_queue_release() sets tx_queues pointer of the device data to NULL. It may lead to the scenario in which a queue is destroyed by sfc_tx_fini_queues() and after the queue is attempted to be destroyed again by sfc_tx_queue_release(). Move NULL assignment to sfc_tx_qfini(). Fixes: b1b7ad933b39 ("net/sfc: set up and release Tx queues") Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 3 --- drivers/net/sfc/sfc_tx.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index d35187a3a..b5ef47296 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -496,7 +496,4 @@ sfc_tx_queue_release(void *queue) sfc_adapter_lock(sa); - SFC_ASSERT(sw_index < sa->eth_dev->data->nb_tx_queues); - sa->eth_dev->data->tx_queues[sw_index] = NULL; - sfc_tx_qfini(sa, sw_index); diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c index 6d42a1a65..0c909b1f5 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -234,4 +234,6 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index) SFC_ASSERT(sw_index < sa->txq_count); + sa->eth_dev->data->tx_queues[sw_index] = NULL; + txq_info = &sa->txq_info[sw_index]; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:14.112898303 +0000 +++ 0019-net-sfc-fix-a-Tx-queue-double-release-possibility.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,8 +1,10 @@ -From 5d138ef92d47b34af589e49f505fb1bf6db5f09b Mon Sep 17 00:00:00 2001 +From b6f3cc25414269b602e221c2486448934f71bd01 Mon Sep 17 00:00:00 2001 From: Igor Romanov Date: Fri, 14 Sep 2018 08:31:36 +0100 Subject: [PATCH] net/sfc: fix a Tx queue double release possibility +[ upstream commit 5d138ef92d47b34af589e49f505fb1bf6db5f09b ] + There are two function that call sfc_tx_qfini(): sfc_tx_fini_queues() and sfc_tx_queue_release(). But only sfc_tx_queue_release() sets tx_queues pointer of the device data to NULL. @@ -13,7 +15,6 @@ Move NULL assignment to sfc_tx_qfini(). Fixes: b1b7ad933b39 ("net/sfc: set up and release Tx queues") -Cc: stable@dpdk.org Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko @@ -23,10 +24,10 @@ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c -index 23778c9f3..93bfecc4e 100644 +index d35187a3a..b5ef47296 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c -@@ -499,7 +499,4 @@ sfc_tx_queue_release(void *queue) +@@ -496,7 +496,4 @@ sfc_tx_queue_release(void *queue) sfc_adapter_lock(sa); - SFC_ASSERT(sw_index < sa->eth_dev->data->nb_tx_queues); @@ -35,7 +36,7 @@ sfc_tx_qfini(sa, sw_index); diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c -index 8af08b37c..12665d813 100644 +index 6d42a1a65..0c909b1f5 100644 --- a/drivers/net/sfc/sfc_tx.c +++ b/drivers/net/sfc/sfc_tx.c @@ -234,4 +234,6 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)