[PATCH] crypto/fsl: Clear the memory when blob decapsulation fails

[PATCH] crypto/fsl: Clear the memory when blob decapsulation fails

[Gaurav Jain]

issue: blob decapsulation operation store the decrypted data
       in memory even if ICV check failed.

fix: clear the blob data output memory.

Fixes: c5de15cbc8 (crypto/fsl: Add command for encapsulating/decapsulating blobs)
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
Reviewed-by: Kshitiz Varshney <kshitiz.varshney@nxp.com>
Tested-by: Kshitiz Varshney <kshitiz.varshney@nxp.com>
---
 drivers/crypto/fsl/fsl_blob.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c
index e8202cc569..9b6e4bca06 100644
--- a/drivers/crypto/fsl/fsl_blob.c
+++ b/drivers/crypto/fsl/fsl_blob.c
@@ -71,6 +71,10 @@ int blob_decap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
 	ret = run_descriptor_jr(desc);
 
 	if (ret) {
+		/* clear the blob data output buffer */
+		memset(dst, 0x00, len);
+		size = ALIGN(len, ARCH_DMA_MINALIGN);
+		flush_dcache_range((unsigned long)dst, (unsigned long)dst + size);
 		printf("Error in blob decapsulation: %d\n", ret);
 	} else {
 		size = ALIGN(len, ARCH_DMA_MINALIGN);
-- 
2.25.1

Re: [PATCH] crypto/fsl: Clear the memory when blob decapsulation fails

[Fabio Estevam]

On Fri, Apr 15, 2022 at 8:23 AM Gaurav Jain <gaurav.jain@nxp.com> wrote:
>
> issue: blob decapsulation operation store the decrypted data
>        in memory even if ICV check failed.
>
> fix: clear the blob data output memory.
>
> Fixes: c5de15cbc8 (crypto/fsl: Add command for encapsulating/decapsulating blobs)
> Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
> Reviewed-by: Kshitiz Varshney <kshitiz.varshney@nxp.com>
> Tested-by: Kshitiz Varshney <kshitiz.varshney@nxp.com>

Reviewed-by: Fabio Estevam <festevam@denx.de>

[PATCH] crypto/fsl: Clear the memory when blob decapsulation fails

[sbabic]

> issue: blob decapsulation operation store the decrypted data
>        in memory even if ICV check failed.
> fix: clear the blob data output memory.
> Fixes: c5de15cbc8 (crypto/fsl: Add command for encapsulating/decapsulating blobs)
> Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
> Reviewed-by: Kshitiz Varshney <kshitiz.varshney@nxp.com>
> Tested-by: Kshitiz Varshney <kshitiz.varshney@nxp.com>
> Reviewed-by: Fabio Estevam <festevam@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================