* [dpdk-dev] [PATCH] app/test-crypto-perf: fix double allocation of memory
@ 2018-09-10 6:14 Anoob Joseph
2018-09-10 6:40 ` [dpdk-dev] [PATCH v1] " Anoob Joseph
0 siblings, 1 reply; 4+ messages in thread
From: Anoob Joseph @ 2018-09-10 6:14 UTC (permalink / raw)
To: Akhil Goyal, Declan Doherty, Pablo de Lara
Cc: Anoob Joseph, Jerin Jacob, Narayana Prasad, dev, Akash Saxena
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 <akash.saxena@caviumnetworks.com>
Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
---
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 907a995..a6c2350 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)
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_vc->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;
@@ -433,17 +439,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.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH v1] app/test-crypto-perf: fix double allocation of memory
2018-09-10 6:14 [dpdk-dev] [PATCH] app/test-crypto-perf: fix double allocation of memory Anoob Joseph
@ 2018-09-10 6:40 ` Anoob Joseph
2018-09-25 14:31 ` Akhil Goyal
2018-09-26 12:26 ` Akhil Goyal
0 siblings, 2 replies; 4+ messages in thread
From: Anoob Joseph @ 2018-09-10 6:40 UTC (permalink / raw)
To: Akhil Goyal, Declan Doherty, Pablo de Lara
Cc: Anoob Joseph, Jerin Jacob, Narayana Prasad, dev, Akash Saxena
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 <akash.saxena@caviumnetworks.com>
Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
---
v1:
* Fixed typo
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 907a995..1af9524 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)
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;
@@ -433,17 +439,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.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH v1] app/test-crypto-perf: fix double allocation of memory
2018-09-10 6:40 ` [dpdk-dev] [PATCH v1] " Anoob Joseph
@ 2018-09-25 14:31 ` Akhil Goyal
2018-09-26 12:26 ` Akhil Goyal
1 sibling, 0 replies; 4+ messages in thread
From: Akhil Goyal @ 2018-09-25 14:31 UTC (permalink / raw)
To: Anoob Joseph, Declan Doherty, Pablo de Lara
Cc: Jerin Jacob, Narayana Prasad, dev, Akash Saxena
On 9/10/2018 12:10 PM, Anoob Joseph wrote:
> 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 <akash.saxena@caviumnetworks.com>
> Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
> ---
> v1:
> * Fixed typo
>
>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH v1] app/test-crypto-perf: fix double allocation of memory
2018-09-10 6:40 ` [dpdk-dev] [PATCH v1] " Anoob Joseph
2018-09-25 14:31 ` Akhil Goyal
@ 2018-09-26 12:26 ` Akhil Goyal
1 sibling, 0 replies; 4+ messages in thread
From: Akhil Goyal @ 2018-09-26 12:26 UTC (permalink / raw)
To: Anoob Joseph, Declan Doherty, Pablo de Lara
Cc: Jerin Jacob, Narayana Prasad, dev, Akash Saxena, stable
On 9/10/2018 12:10 PM, Anoob Joseph wrote:
> 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 <akash.saxena@caviumnetworks.com>
> Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
>
Applied to dpdk-next-crypto
cc: stable@dpdk.org
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-26 12:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-10 6:14 [dpdk-dev] [PATCH] app/test-crypto-perf: fix double allocation of memory Anoob Joseph
2018-09-10 6:40 ` [dpdk-dev] [PATCH v1] " Anoob Joseph
2018-09-25 14:31 ` Akhil Goyal
2018-09-26 12:26 ` Akhil Goyal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).