[PATCH] crypto: xilinx - use kfree_sensitive() in cleanup paths

[PATCH] crypto: xilinx - use kfree_sensitive() in cleanup paths

[Thorsten Blum]

In zynqmp_aes_aead_cipher() and versal_aes_aead_cipher(), replace
memzero_explicit() followed by kfree() with kfree_sensitive() to
simplify the code.

Signed-off-by: Thorsten Blum <blum@kernel.org>
---
 drivers/crypto/xilinx/zynqmp-aes-gcm.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/crypto/xilinx/zynqmp-aes-gcm.c b/drivers/crypto/xilinx/zynqmp-aes-gcm.c
index ebee37dddb1f..d9bd6dcd23a6 100644
--- a/drivers/crypto/xilinx/zynqmp-aes-gcm.c
+++ b/drivers/crypto/xilinx/zynqmp-aes-gcm.c
@@ -230,10 +230,8 @@ static int zynqmp_aes_aead_cipher(struct aead_request *req)
 	}
 
 freemem:
-	memzero_explicit(kbuf, dma_size);
-	kfree(kbuf);
-	memzero_explicit(dmabuf, sizeof(struct zynqmp_aead_hw_req) + GCM_AES_IV_SIZE);
-	kfree(dmabuf);
+	kfree_sensitive(kbuf);
+	kfree_sensitive(dmabuf);
 
 	return ret;
 }
@@ -364,11 +362,9 @@ static int versal_aes_aead_cipher(struct aead_request *req)
 	if (unlikely(dma_addr_hw_req))
 		dma_unmap_single(dev, dma_addr_hw_req, dmabuf_size, DMA_BIDIRECTIONAL);
 buf2_free:
-	memzero_explicit(dmabuf, dmabuf_size);
-	kfree(dmabuf);
+	kfree_sensitive(dmabuf);
 buf1_free:
-	memzero_explicit(kbuf, kbuf_size);
-	kfree(kbuf);
+	kfree_sensitive(kbuf);
 err:
 	return ret;
 }

RE: [PATCH] crypto: xilinx - use kfree_sensitive() in cleanup paths

[Jain, Harsh (AECG-SSW)]

AMD General

> -----Original Message-----
> From: Thorsten Blum <blum@kernel.org>
> Sent: Wednesday, September 9, 2026 12:30 AM
> To: Herbert Xu <herbert@gondor.apana.org.au>; David S. Miller
> <davem@davemloft.net>; Simek, Michal <michal.simek@amd.com>; Jain,
> Harsh (AECG-SSW) <h.jain@amd.com>; Uwe Kleine-König (The Capable Hub)
> <u.kleine-koenig@baylibre.com>; Danilo Krummrich <dakr@kernel.org>;
> Takashi Sakamoto <o-takashi@sakamocchi.jp>
> Cc: Thorsten Blum <blum@kernel.org>; linux-crypto@vger.kernel.org; linux-
> arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] crypto: xilinx - use kfree_sensitive() in cleanup paths
>
>
>
> In zynqmp_aes_aead_cipher() and versal_aes_aead_cipher(), replace
> memzero_explicit() followed by kfree() with kfree_sensitive() to
> simplify the code.
>
> Signed-off-by: Thorsten Blum <blum@kernel.org>
> ---
>  drivers/crypto/xilinx/zynqmp-aes-gcm.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/crypto/xilinx/zynqmp-aes-gcm.c
> b/drivers/crypto/xilinx/zynqmp-aes-gcm.c
> index ebee37dddb1f..d9bd6dcd23a6 100644
> --- a/drivers/crypto/xilinx/zynqmp-aes-gcm.c
> +++ b/drivers/crypto/xilinx/zynqmp-aes-gcm.c
> @@ -230,10 +230,8 @@ static int zynqmp_aes_aead_cipher(struct
> aead_request *req)
>         }
>
>  freemem:
> -       memzero_explicit(kbuf, dma_size);
> -       kfree(kbuf);
> -       memzero_explicit(dmabuf, sizeof(struct zynqmp_aead_hw_req) +
> GCM_AES_IV_SIZE);
> -       kfree(dmabuf);
> +       kfree_sensitive(kbuf);
> +       kfree_sensitive(dmabuf);
>
>         return ret;
>  }
> @@ -364,11 +362,9 @@ static int versal_aes_aead_cipher(struct aead_request
> *req)
>         if (unlikely(dma_addr_hw_req))
>                 dma_unmap_single(dev, dma_addr_hw_req, dmabuf_size,
> DMA_BIDIRECTIONAL);
>  buf2_free:
> -       memzero_explicit(dmabuf, dmabuf_size);
> -       kfree(dmabuf);
> +       kfree_sensitive(dmabuf);
>  buf1_free:
> -       memzero_explicit(kbuf, kbuf_size);
> -       kfree(kbuf);
> +       kfree_sensitive(kbuf);
>  err:
>         return ret;
>  }

Reviewed-by: Harsh Jain <h.jain@amd.com>