Included are patches with small fixes for unnecessary memory allocation, and incomplete resetting of a pointer. Ciara Power (2): examples/fips_validation: fix unused malloc examples/fips_validation: fix resetting pointer examples/fips_validation/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.25.1
The val.val pointer is allocated memory, however this memory is then freed in get_writeback_data() without being used beforehand. The pointer is then allocated memory again before use, so the very first allocation is removed as it was unnecessary. Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA") Cc: damianx.nowak@intel.com Cc: stable@dpdk.org Signed-off-by: Ciara Power <ciara.power@intel.com> --- examples/fips_validation/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index c175fe6ac2..2db00620ce 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -1635,7 +1635,6 @@ fips_mct_sha_test(void) int ret; uint32_t i, j; - val.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0); for (i = 0; i < SHA_MD_BLOCK; i++) md[i].val = rte_malloc(NULL, (MAX_DIGEST_SIZE*2), 0); -- 2.25.1
The env.digest memory was freed, but the pointer was not set to NULL afterwards. This caused an "Invalid Memory" error, as the pointer tries to free twice. Fixes: 952e10cdad5e ("examples/fips_validation: support scatter gather list") Cc: roy.fan.zhang@intel.com Cc: stable@dpdk.org Signed-off-by: Ciara Power <ciara.power@intel.com> --- examples/fips_validation/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 2db00620ce..5d14513a58 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -1846,8 +1846,10 @@ fips_test_one_file(void) fips_test_clear(); - if (env.digest) + if (env.digest) { rte_free(env.digest); + env.digest = NULL; + } if (env.mbuf) rte_pktmbuf_free(env.mbuf); -- 2.25.1
> -----Original Message-----
> From: Power, Ciara <ciara.power@intel.com>
> Sent: Thursday, August 12, 2021 3:25 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Zhang, Roy Fan <roy.fan.zhang@intel.com>; Power,
> Ciara <ciara.power@intel.com>; damianx.nowak@intel.com; Kovacevic,
> Marko <marko.kovacevic@intel.com>
> Subject: [PATCH v1 1/2] examples/fips_validation: fix unused malloc
>
> The val.val pointer is allocated memory, however this memory is then
> freed in get_writeback_data() without being used beforehand.
> The pointer is then allocated memory again before use,
> so the very first allocation is removed as it was unnecessary.
>
> Fixes: f4797bae0050 ("examples/fips_validation: support plain SHA")
> Cc: damianx.nowak@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Ciara Power <ciara.power@intel.com>
> ---
> examples/fips_validation/main.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/examples/fips_validation/main.c
> b/examples/fips_validation/main.c
> index c175fe6ac2..2db00620ce 100644
> --- a/examples/fips_validation/main.c
> +++ b/examples/fips_validation/main.c
> @@ -1635,7 +1635,6 @@ fips_mct_sha_test(void)
> int ret;
> uint32_t i, j;
>
> - val.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0);
> for (i = 0; i < SHA_MD_BLOCK; i++)
> md[i].val = rte_malloc(NULL, (MAX_DIGEST_SIZE*2), 0);
>
> --
> 2.25.1
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
> -----Original Message-----
> From: Power, Ciara <ciara.power@intel.com>
> Sent: Thursday, August 12, 2021 3:25 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Zhang, Roy Fan <roy.fan.zhang@intel.com>; Power,
> Ciara <ciara.power@intel.com>; Kovacevic, Marko
> <marko.kovacevic@intel.com>
> Subject: [PATCH v1 2/2] examples/fips_validation: fix resetting pointer
>
> The env.digest memory was freed, but the pointer was not set to NULL
> afterwards. This caused an "Invalid Memory" error, as the pointer tries
> to free twice.
>
> Fixes: 952e10cdad5e ("examples/fips_validation: support scatter gather list")
> Cc: roy.fan.zhang@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Ciara Power <ciara.power@intel.com>
> ---
> examples/fips_validation/main.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/examples/fips_validation/main.c
> b/examples/fips_validation/main.c
> index 2db00620ce..5d14513a58 100644
> --- a/examples/fips_validation/main.c
> +++ b/examples/fips_validation/main.c
> @@ -1846,8 +1846,10 @@ fips_test_one_file(void)
>
> fips_test_clear();
>
> - if (env.digest)
> + if (env.digest) {
> rte_free(env.digest);
> + env.digest = NULL;
> + }
> if (env.mbuf)
> rte_pktmbuf_free(env.mbuf);
>
> --
> 2.25.1
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
> Included are patches with small fixes for unnecessary memory allocation,
> and incomplete resetting of a pointer.
>
> Ciara Power (2):
> examples/fips_validation: fix unused malloc
> examples/fips_validation: fix resetting pointer
>
> examples/fips_validation/main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
Series Applied to dpdk-next-crypto
Thanks.