[PATCH] board: fsl_validate: Fix resource leak issue

2021-08-01 Thread Kshitiz Varshney 
Free dynamically allocated memory before every return statement
in calc_img_key_hash() and calc_esbchdr_esbc_hash() function.
Verified the secure boot changes using ls1046afrwy board.

Signed-off-by: Kshitiz Varshney 
---
 board/freescale/common/fsl_validate.c | 36 ---
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/board/freescale/common/fsl_validate.c 
b/board/freescale/common/fsl_validate.c
index 564a8b3b54..5cec0131f2 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2015 Freescale Semiconductor, Inc.
+ * Copyright 2021 NXP
  */
 
 #include 
@@ -498,8 +499,11 @@ static int calc_img_key_hash(struct fsl_secboot_img_priv 
*img)
return ret;
 
ret = algo->hash_init(algo, );
-   if (ret)
+   if (ret) {
+   if (ctx)
+   free(ctx);
return ret;
+   }
 
/* Update hash for ESBC key */
 #ifdef CONFIG_KEY_REVOCATION
@@ -518,8 +522,11 @@ static int calc_img_key_hash(struct fsl_secboot_img_priv 
*img)
 
/* Copy hash at destination buffer */
ret = algo->hash_finish(algo, ctx, hash_val, algo->digest_size);
-   if (ret)
+   if (ret) {
+   if (ctx)
+   free(ctx);
return ret;
+   }
 
for (i = 0; i < SHA256_BYTES; i++)
img->img_key_hash[i] = hash_val[i];
@@ -547,14 +554,18 @@ static int calc_esbchdr_esbc_hash(struct 
fsl_secboot_img_priv *img)
 
ret = algo->hash_init(algo, );
/* Copy hash at destination buffer */
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
+   }
 
/* Update hash for CSF Header */
ret = algo->hash_update(algo, ctx,
(u8 *)>hdr, sizeof(struct fsl_secboot_img_hdr), 0);
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
+   }
 
/* Update the hash with that of srk table if srk flag is 1
 * If IE Table is selected, key is not added in the hash
@@ -581,22 +592,29 @@ static int calc_esbchdr_esbc_hash(struct 
fsl_secboot_img_priv *img)
key_hash = 1;
}
 #endif
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
-   if (!key_hash)
+   }
+   if (!key_hash) {
+   free(ctx);
return ERROR_KEY_TABLE_NOT_FOUND;
+   }
 
/* Update hash for actual Image */
ret = algo->hash_update(algo, ctx,
(u8 *)(*(img->img_addr_ptr)), img->img_size, 1);
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
+   }
 
/* Copy hash at destination buffer */
ret = algo->hash_finish(algo, ctx, hash_val, algo->digest_size);
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
-
+   }
return 0;
 }
 
-- 
2.25.1

[PATCH] board: fsl_validate: Fix resource leak issue

2021-07-23 Thread Kshitiz Varshney 
Free dynamically allocated memory before every return statement
in calc_esbchdr_esbc_hash() function.
Verified the secure boot changes using ls1046afrwy board.

Signed-off-by: Kshitiz Varshney 
---
 board/freescale/common/fsl_validate.c | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/board/freescale/common/fsl_validate.c 
b/board/freescale/common/fsl_validate.c
index 564a8b3b54..05d9a004e7 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -547,14 +547,18 @@ static int calc_esbchdr_esbc_hash(struct 
fsl_secboot_img_priv *img)
 
ret = algo->hash_init(algo, );
/* Copy hash at destination buffer */
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
+   }
 
/* Update hash for CSF Header */
ret = algo->hash_update(algo, ctx,
(u8 *)>hdr, sizeof(struct fsl_secboot_img_hdr), 0);
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
+   }
 
/* Update the hash with that of srk table if srk flag is 1
 * If IE Table is selected, key is not added in the hash
@@ -581,22 +585,29 @@ static int calc_esbchdr_esbc_hash(struct 
fsl_secboot_img_priv *img)
key_hash = 1;
}
 #endif
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
-   if (!key_hash)
+   }
+   if (!key_hash) {
+   free(ctx);
return ERROR_KEY_TABLE_NOT_FOUND;
+   }
 
/* Update hash for actual Image */
ret = algo->hash_update(algo, ctx,
(u8 *)(*(img->img_addr_ptr)), img->img_size, 1);
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
+   }
 
/* Copy hash at destination buffer */
ret = algo->hash_finish(algo, ctx, hash_val, algo->digest_size);
-   if (ret)
+   if (ret) {
+   free(ctx);
return ret;
-
+   }
return 0;
 }
 
-- 
2.25.1

[PATCH] board: fsl_validate: Fix resource leak issue

2021-07-23 Thread Kshitiz Varshney 
Free dynamically allocated memory before every return statement
in calc_img_key_hash() function.
Verified the secure boot changes using ls1046afrwy board.
Signed-off-by: Kshitiz Varshney 
---
 board/freescale/common/fsl_validate.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/board/freescale/common/fsl_validate.c 
b/board/freescale/common/fsl_validate.c
index 564a8b3b54..d553bd88a0 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/freescale/common/fsl_validate.c
@@ -498,8 +498,11 @@ static int calc_img_key_hash(struct fsl_secboot_img_priv 
*img)
return ret;
 
ret = algo->hash_init(algo, );
-   if (ret)
+   if (ret) {
+   if (ctx)
+   free(ctx);
return ret;
+   }
 
/* Update hash for ESBC key */
 #ifdef CONFIG_KEY_REVOCATION
@@ -518,8 +521,11 @@ static int calc_img_key_hash(struct fsl_secboot_img_priv 
*img)
 
/* Copy hash at destination buffer */
ret = algo->hash_finish(algo, ctx, hash_val, algo->digest_size);
-   if (ret)
+   if (ret) {
+   if (ctx)
+   free(ctx);
return ret;
+   }
 
for (i = 0; i < SHA256_BYTES; i++)
img->img_key_hash[i] = hash_val[i];
-- 
2.25.1