From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 697E1A046B for ; Tue, 23 Jul 2019 03:03:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 267481BFCD; Tue, 23 Jul 2019 03:03:36 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id AEE411BFB9 for ; Tue, 23 Jul 2019 03:03:34 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:33 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11Hg2026580; Tue, 23 Jul 2019 04:03:32 +0300 From: Yongseok Koh To: Bruce Richardson Cc: Fan Zhang , Akhil Goyal , dpdk stable Date: Mon, 22 Jul 2019 18:00:43 -0700 Message-Id: <20190723010115.6446-76-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/crypto-perf: check range of socket id' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Thanks. Yongseok --- >From a8f98008f0c72ab92ace60037b5eaa9b2d4f3533 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 8 Apr 2019 10:25:14 +0100 Subject: [PATCH] app/crypto-perf: check range of socket id [ upstream commit 64c469b9e7d8faa85745adbfaf02d17cbb5b2bb4 ] The socket_id is used as an array index so should be within the range of zero to max numa nodes. Add a range check to ensure we don't get excessive values. Coverity issue: 336812 Coverity issue: 336829 Fixes: 2c59bd32b70d ("cryptodev: do not create session mempool internally") Signed-off-by: Bruce Richardson Acked-by: Fan Zhang Acked-by: Akhil Goyal --- app/test-crypto-perf/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c index be861cc0f9..e027589cfd 100644 --- a/app/test-crypto-perf/main.c +++ b/app/test-crypto-perf/main.c @@ -156,6 +156,11 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs, struct rte_cryptodev_info cdev_info; uint8_t socket_id = rte_cryptodev_socket_id(cdev_id); + /* range check the socket_id - negative values become big + * positive ones due to use of unsigned value + */ + if (socket_id >= RTE_MAX_NUMA_NODES) + socket_id = 0; rte_cryptodev_info_get(cdev_id, &cdev_info); if (opts->nb_qps > cdev_info.max_nb_queue_pairs) { -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:10.551016626 -0700 +++ 0076-app-crypto-perf-check-range-of-socket-id.patch 2019-07-22 17:55:06.268473000 -0700 @@ -1,8 +1,10 @@ -From 64c469b9e7d8faa85745adbfaf02d17cbb5b2bb4 Mon Sep 17 00:00:00 2001 +From a8f98008f0c72ab92ace60037b5eaa9b2d4f3533 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 8 Apr 2019 10:25:14 +0100 Subject: [PATCH] app/crypto-perf: check range of socket id +[ upstream commit 64c469b9e7d8faa85745adbfaf02d17cbb5b2bb4 ] + The socket_id is used as an array index so should be within the range of zero to max numa nodes. Add a range check to ensure we don't get excessive values. @@ -10,7 +12,6 @@ Coverity issue: 336812 Coverity issue: 336829 Fixes: 2c59bd32b70d ("cryptodev: do not create session mempool internally") -CC: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Fan Zhang @@ -20,10 +21,10 @@ 1 file changed, 5 insertions(+) diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c -index 175c639fbe..4247f6add9 100644 +index be861cc0f9..e027589cfd 100644 --- a/app/test-crypto-perf/main.c +++ b/app/test-crypto-perf/main.c -@@ -183,6 +183,11 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) +@@ -156,6 +156,11 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs, struct rte_cryptodev_info cdev_info; uint8_t socket_id = rte_cryptodev_socket_id(cdev_id);