From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CDAEAA0C45 for ; Thu, 10 Jun 2021 14:07:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C791F4069B; Thu, 10 Jun 2021 14:07:59 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id ED69F40E64 for ; Thu, 10 Jun 2021 14:07:58 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTY-00009n-Ac; Thu, 10 Jun 2021 12:07:56 +0000 From: Christian Ehrhardt To: "Min Hu (Connor)" Cc: Akhil Goyal , dpdk stable Date: Thu, 10 Jun 2021 14:06:19 +0200 Message-Id: <20210610120641.885862-31-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/crypto-perf: check memory allocation' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/02d8cd1aef6dd237588b159671c96112776144c9 Thanks. Christian Ehrhardt --- >From 02d8cd1aef6dd237588b159671c96112776144c9 Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Thu, 6 May 2021 14:13:59 +0800 Subject: [PATCH] app/crypto-perf: check memory allocation [ upstream commit 37c0359bc550e0cf3938382553c7dbb4fb21567d ] Return value of a function 'rte_zmalloc' is dereferenced without checking, and it may call segmentation fault. This patch fixed it. Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application") Signed-off-by: Min Hu (Connor) Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_options_parsing.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c index 22bf9cd4d6..e16e8eca9c 100644 --- a/app/test-crypto-perf/cperf_options_parsing.c +++ b/app/test-crypto-perf/cperf_options_parsing.c @@ -495,6 +495,12 @@ parse_test_name(struct cperf_options *opts, { char *test_name = (char *) rte_zmalloc(NULL, sizeof(char) * (strlen(arg) + 3), 0); + if (test_name == NULL) { + RTE_LOG(ERR, USER1, "Failed to rte zmalloc with size: %zu\n", + strlen(arg) + 3); + return -1; + } + snprintf(test_name, strlen(arg) + 3, "[%s]", arg); opts->test_name = test_name; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.551738875 +0200 +++ 0031-app-crypto-perf-check-memory-allocation.patch 2021-06-10 14:04:58.062024614 +0200 @@ -1 +1 @@ -From 37c0359bc550e0cf3938382553c7dbb4fb21567d Mon Sep 17 00:00:00 2001 +From 02d8cd1aef6dd237588b159671c96112776144c9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 37c0359bc550e0cf3938382553c7dbb4fb21567d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 40b6dfb648..e84f56cfaa 100644 +index 22bf9cd4d6..e16e8eca9c 100644 @@ -24 +25 @@ -@@ -506,6 +506,12 @@ parse_test_name(struct cperf_options *opts, +@@ -495,6 +495,12 @@ parse_test_name(struct cperf_options *opts,