From: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
To: <dev@dpdk.org>
Cc: Akhil Goyal <gakhil@marvell.com>,
Fan Zhang <roy.fan.zhang@intel.com>,
Brian Dooley <brian.dooley@intel.com>,
Anoob Joseph <anoobj@marvell.com>,
Archana Muniganti <marchana@marvell.com>,
Jerin Jacob <jerinj@marvell.com>,
Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
Subject: [PATCH v1] examples/fips_validation: fix memory allocation in aes mct test
Date: Wed, 13 Jul 2022 12:14:39 +0530 [thread overview]
Message-ID: <20220713064439.3990811-1-gmuthukrishn@marvell.com> (raw)
Instead of allocating memory in every external iteration, do once
in the beginning of AES MCT tests and free at the end.
Fixes: 8b8546aaedf ("examples/fips_validation: add parsing for AES-CBC")
Signed-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
---
examples/fips_validation/main.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 5e65c5e193..8babbb3298 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -1588,9 +1588,12 @@ fips_mct_aes_test(void)
if (info.interim_info.aes_data.cipher_algo == RTE_CRYPTO_CIPHER_AES_ECB)
return fips_mct_aes_ecb_test();
- memset(&pt, 0, sizeof(struct fips_val));
- memset(&ct, 0, sizeof(struct fips_val));
- memset(&iv, 0, sizeof(struct fips_val));
+ pt.len = vec.pt.len;
+ pt.val = calloc(1, pt.len);
+ ct.len = vec.ct.len;
+ ct.val = calloc(1, ct.len);
+ iv.len = vec.iv.len;
+ iv.val = calloc(1, iv.len);
for (i = 0; i < AES_EXTERN_ITER; i++) {
if (info.file_type != FIPS_TYPE_JSON) {
if (i != 0)
@@ -1622,16 +1625,8 @@ fips_mct_aes_test(void)
if (j == 0) {
memcpy(prev_out, val[0].val, AES_BLOCK_SIZE);
- pt.len = vec.pt.len;
- pt.val = calloc(1, pt.len);
memcpy(pt.val, vec.pt.val, pt.len);
-
- ct.len = vec.ct.len;
- ct.val = calloc(1, ct.len);
memcpy(ct.val, vec.ct.val, ct.len);
-
- iv.len = vec.iv.len;
- iv.val = calloc(1, iv.len);
memcpy(iv.val, vec.iv.val, iv.len);
if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
@@ -1670,12 +1665,8 @@ fips_mct_aes_test(void)
if (info.file_type != FIPS_TYPE_JSON)
fprintf(info.fp_wr, "\n");
- if (i == AES_EXTERN_ITER - 1) {
- free(pt.val);
- free(ct.val);
- free(iv.val);
+ if (i == AES_EXTERN_ITER - 1)
continue;
- }
/** update key */
memcpy(&val_key, &vec.cipher_auth.key, sizeof(val_key));
@@ -1706,6 +1697,9 @@ fips_mct_aes_test(void)
}
free(val[0].val);
+ free(pt.val);
+ free(ct.val);
+ free(iv.val);
return 0;
}
--
2.25.1
next reply other threads:[~2022-07-13 6:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-13 6:44 Gowrishankar Muthukrishnan [this message]
2022-08-12 11:47 ` [PATCH v2] examples/fips_validation: fix memory allocation in AES MCT test Gowrishankar Muthukrishnan
2022-09-23 16:30 ` Dooley, Brian
2022-10-07 9:56 ` Akhil Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220713064439.3990811-1-gmuthukrishn@marvell.com \
--to=gmuthukrishn@marvell.com \
--cc=anoobj@marvell.com \
--cc=brian.dooley@intel.com \
--cc=dev@dpdk.org \
--cc=gakhil@marvell.com \
--cc=jerinj@marvell.com \
--cc=marchana@marvell.com \
--cc=roy.fan.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).