From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 0CA8F1B512 for ; Fri, 30 Nov 2018 00:13:30 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:22 +0200 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 wATNCW7W032075; Fri, 30 Nov 2018 01:13:26 +0200 From: Yongseok Koh To: Anoob Joseph Cc: Akash Saxena , Akhil Goyal , dpdk stable Date: Thu, 29 Nov 2018 15:10:26 -0800 Message-Id: <20181129231202.30436-32-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'app/test-crypto-perf: fix double allocation of memory' has been queued to LTS release 17.11.5 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: Thu, 29 Nov 2018 23:13:31 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From 6d518e3eba2cf8a67f6e88be56a91ee25219be33 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Mon, 10 Sep 2018 12:10:58 +0530 Subject: [PATCH] app/test-crypto-perf: fix double allocation of memory [ upstream commit c61518ed86a02118322c9250be1797a58e3974ba ] The field, 'cipher_iv.data' is allocated twice when cipher is not null. Ideally the allocation should depend only on the field 'cperf_options.cipher_iv_sz'. This will make sure this code path gets valid for ciphers which doesn't require IV. Fixes: 0fbd75a99fc9 ("cryptodev: move IV parameters to session") Signed-off-by: Akash Saxena Signed-off-by: Anoob Joseph Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_test_vectors.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_vectors.c b/app/test-crypto-perf/cperf_test_vectors.c index fa911ff69..c048652df 100644 --- a/app/test-crypto-perf/cperf_test_vectors.c +++ b/app/test-crypto-perf/cperf_test_vectors.c @@ -447,13 +447,19 @@ cperf_test_vector_get_dummy(struct cperf_options *options) t_vec->cipher_key.length = 0; t_vec->ciphertext.data = plaintext; t_vec->cipher_key.data = NULL; - t_vec->cipher_iv.data = NULL; } else { t_vec->cipher_key.length = options->cipher_key_sz; t_vec->ciphertext.data = ciphertext; t_vec->cipher_key.data = cipher_key; - t_vec->cipher_iv.data = rte_malloc(NULL, options->cipher_iv_sz, - 16); + } + + /* Init IV data ptr */ + t_vec->cipher_iv.data = NULL; + + if (options->cipher_iv_sz != 0) { + /* Set IV parameters */ + t_vec->cipher_iv.data = rte_malloc(NULL, + options->cipher_iv_sz, 16); if (t_vec->cipher_iv.data == NULL) { rte_free(t_vec); return NULL; @@ -461,17 +467,7 @@ cperf_test_vector_get_dummy(struct cperf_options *options) memcpy(t_vec->cipher_iv.data, iv, options->cipher_iv_sz); } t_vec->ciphertext.length = options->max_buffer_size; - - /* Set IV parameters */ - t_vec->cipher_iv.data = rte_malloc(NULL, options->cipher_iv_sz, - 16); - if (options->cipher_iv_sz && t_vec->cipher_iv.data == NULL) { - rte_free(t_vec); - return NULL; - } - memcpy(t_vec->cipher_iv.data, iv, options->cipher_iv_sz); t_vec->cipher_iv.length = options->cipher_iv_sz; - t_vec->data.cipher_offset = 0; t_vec->data.cipher_length = options->max_buffer_size; -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:46.666163887 -0800 +++ 0032-app-test-crypto-perf-fix-double-allocation-of-memory.patch 2018-11-29 15:01:45.040968000 -0800 @@ -1,15 +1,16 @@ -From c61518ed86a02118322c9250be1797a58e3974ba Mon Sep 17 00:00:00 2001 +From 6d518e3eba2cf8a67f6e88be56a91ee25219be33 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Mon, 10 Sep 2018 12:10:58 +0530 Subject: [PATCH] app/test-crypto-perf: fix double allocation of memory +[ upstream commit c61518ed86a02118322c9250be1797a58e3974ba ] + The field, 'cipher_iv.data' is allocated twice when cipher is not null. Ideally the allocation should depend only on the field 'cperf_options.cipher_iv_sz'. This will make sure this code path gets valid for ciphers which doesn't require IV. Fixes: 0fbd75a99fc9 ("cryptodev: move IV parameters to session") -Cc: stable@dpdk.org Signed-off-by: Akash Saxena Signed-off-by: Anoob Joseph @@ -19,10 +20,10 @@ 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_vectors.c b/app/test-crypto-perf/cperf_test_vectors.c -index 907a995cc..1af952499 100644 +index fa911ff69..c048652df 100644 --- a/app/test-crypto-perf/cperf_test_vectors.c +++ b/app/test-crypto-perf/cperf_test_vectors.c -@@ -419,13 +419,19 @@ cperf_test_vector_get_dummy(struct cperf_options *options) +@@ -447,13 +447,19 @@ cperf_test_vector_get_dummy(struct cperf_options *options) t_vec->cipher_key.length = 0; t_vec->ciphertext.data = plaintext; t_vec->cipher_key.data = NULL; @@ -45,7 +46,7 @@ if (t_vec->cipher_iv.data == NULL) { rte_free(t_vec); return NULL; -@@ -433,17 +439,7 @@ cperf_test_vector_get_dummy(struct cperf_options *options) +@@ -461,17 +467,7 @@ cperf_test_vector_get_dummy(struct cperf_options *options) memcpy(t_vec->cipher_iv.data, iv, options->cipher_iv_sz); } t_vec->ciphertext.length = options->max_buffer_size;