From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C659FA0096 for ; Wed, 8 May 2019 12:16:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD01A49DF; Wed, 8 May 2019 12:16:51 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 46F5D2BD5 for ; Wed, 8 May 2019 12:16:50 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B05C7461CD; Wed, 8 May 2019 10:16:49 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id A167A1A267; Wed, 8 May 2019 10:16:48 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Rami Rosen , dpdk stable Date: Wed, 8 May 2019 11:15:18 +0100 Message-Id: <20190508101534.8984-36-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 08 May 2019 10:16:49 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix dereference before null check in mbuf release' has been queued to LTS release 18.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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/13/19. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/09e24483cf9ee83085f73fce14c2ca46f65148f0 Thanks. Kevin Traynor --- >From 09e24483cf9ee83085f73fce14c2ca46f65148f0 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 8 Apr 2019 10:46:38 +0100 Subject: [PATCH] net/i40e: fix dereference before null check in mbuf release [ upstream commit 3f1b8bf9139ab94aa5ba1334499c3928ec630359 ] Coverity flags that the txq variable is used before it's checked for NULL. Also fix typo in error message. Coverity issue: 195023 Fixes: 24853544c84c ("net/i40e: fix mbuf free in vector Tx") Signed-off-by: Bruce Richardson Acked-by: Rami Rosen --- drivers/net/i40e/i40e_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 58ed8145d..1489552da 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2424,11 +2424,11 @@ i40e_tx_queue_release_mbufs(struct i40e_tx_queue *txq) uint16_t i; - dev = &rte_eth_devices[txq->port_id]; - if (!txq || !txq->sw_ring) { - PMD_DRV_LOG(DEBUG, "Pointer to rxq or sw_ring is NULL"); + PMD_DRV_LOG(DEBUG, "Pointer to txq or sw_ring is NULL"); return; } + dev = &rte_eth_devices[txq->port_id]; + /** * vPMD tx will not set sw_ring's mbuf to NULL after free, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.613541069 +0100 +++ 0036-net-i40e-fix-dereference-before-null-check-in-mbuf-r.patch 2019-05-08 11:05:05.818932991 +0100 @@ -1 +1 @@ -From 3f1b8bf9139ab94aa5ba1334499c3928ec630359 Mon Sep 17 00:00:00 2001 +From 09e24483cf9ee83085f73fce14c2ca46f65148f0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3f1b8bf9139ab94aa5ba1334499c3928ec630359 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org