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 E6C41A0096 for ; Wed, 8 May 2019 12:16:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DCD9237B7; Wed, 8 May 2019 12:16:54 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2C6502862 for ; Wed, 8 May 2019 12:16:53 +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 93A32305B886; Wed, 8 May 2019 10:16:52 +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 80FE51A267; Wed, 8 May 2019 10:16:51 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Rami Rosen , dpdk stable Date: Wed, 8 May 2019 11:15:20 +0100 Message-Id: <20190508101534.8984-38-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.41]); Wed, 08 May 2019 10:16:52 +0000 (UTC) Subject: [dpdk-stable] patch 'app/testpmd: fix variable use before null check' 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/b717bb833f6927a729d417ff998ead0d9aef9c14 Thanks. Kevin Traynor --- >From b717bb833f6927a729d417ff998ead0d9aef9c14 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 8 Apr 2019 10:46:39 +0100 Subject: [PATCH] app/testpmd: fix variable use before null check [ upstream commit 17250a2affdf88557911bbff086a00d05960a7ca ] The value returned from rte_eth_dev_tx_offload_name() function is used for string comparison before being checked for NULL. Move the NULL check up to be done first. Coverity issue: 279438 Fixes: c73a9071877a ("app/testpmd: add commands to test new offload API") Signed-off-by: Bruce Richardson Acked-by: Rami Rosen --- app/test-pmd/cmdline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 5d719a186..a5f1ae693 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -18197,4 +18197,6 @@ search_tx_offload(const char *name) for (bit = 0; bit < sizeof(single_offload) * CHAR_BIT; bit++) { single_name = rte_eth_dev_tx_offload_name(single_offload); + if (single_name == NULL) + break; if (!strcasecmp(single_name, name)) { found = 1; @@ -18202,6 +18204,4 @@ search_tx_offload(const char *name) } else if (!strcasecmp(single_name, "UNKNOWN")) break; - else if (single_name == NULL) - break; single_offload <<= 1; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.716528938 +0100 +++ 0038-app-testpmd-fix-variable-use-before-null-check.patch 2019-05-08 11:05:05.847932385 +0100 @@ -1 +1 @@ -From 17250a2affdf88557911bbff086a00d05960a7ca Mon Sep 17 00:00:00 2001 +From b717bb833f6927a729d417ff998ead0d9aef9c14 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 17250a2affdf88557911bbff086a00d05960a7ca ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 0558bc58a..5a10c5f38 100644 +index 5d719a186..a5f1ae693 100644 @@ -24 +25 @@ -@@ -18311,4 +18311,6 @@ search_tx_offload(const char *name) +@@ -18197,4 +18197,6 @@ search_tx_offload(const char *name) @@ -31 +32 @@ -@@ -18316,6 +18318,4 @@ search_tx_offload(const char *name) +@@ -18202,6 +18204,4 @@ search_tx_offload(const char *name)