2023-07-31 14:35:22

by Yang Yingliang

Subject: [PATCH -next] crypto: starfive - fix return value check in starfive_aes_prepare_req()

kzalloc() returns NULL pointer not PTR_ERR() when it fails,
so replace the IS_ERR() check with NULL pointer check.

Fixes: e22471c2331c ("crypto: starfive - Add AES skcipher and aead support")
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/crypto/starfive/jh7110-aes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/starfive/jh7110-aes.c b/drivers/crypto/starfive/jh7110-aes.c
index 04dd7958054f..278dfa4aa743 100644
--- a/drivers/crypto/starfive/jh7110-aes.c
+++ b/drivers/crypto/starfive/jh7110-aes.c
@@ -496,8 +496,8 @@ static int starfive_aes_prepare_req(struct skcipher_request *req,

if (cryp->assoclen) {
rctx->adata = kzalloc(ALIGN(cryp->assoclen, AES_BLOCK_SIZE), GFP_KERNEL);
- if (IS_ERR(rctx->adata))
- return dev_err_probe(cryp->dev, PTR_ERR(rctx->adata),
+ if (!rctx->adata)
+ return dev_err_probe(cryp->dev, -ENOMEM,
"Failed to alloc memory for adata");

scatterwalk_copychunks(rctx->adata, &cryp->in_walk, cryp->assoclen, 0);
--
2.25.1

2023-08-11 11:45:54

by Herbert Xu

Subject: Re: [PATCH -next] crypto: starfive - fix return value check in starfive_aes_prepare_req()

On Mon, Jul 31, 2023 at 10:02:49PM +0800, Yang Yingliang wrote:
> kzalloc() returns NULL pointer not PTR_ERR() when it fails,
> so replace the IS_ERR() check with NULL pointer check.
>
> Fixes: e22471c2331c ("crypto: starfive - Add AES skcipher and aead support")
> Signed-off-by: Yang Yingliang <[email protected]>
> ---
> drivers/crypto/starfive/jh7110-aes.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt