Commit ccb679fd authored by Zilin Guan's avatar Zilin Guan Committed by Herbert Xu
Browse files

crypto: starfive - Fix memory leak in starfive_aes_aead_do_one_req() 



The starfive_aes_aead_do_one_req() function allocates rctx->adata with
kzalloc() but fails to free it if sg_copy_to_buffer() or
starfive_aes_hw_init() fails, which lead to memory leaks.

Since rctx->adata is unconditionally freed after the write_adata
operations, ensure consistent cleanup by freeing the allocation in these
earlier error paths as well.

Compile tested only. Issue found using a prototype static analysis tool
and code review.

Fixes: 7467147e ("crypto: starfive - Use dma for aes requests")
Signed-off-by: default avatarZilin Guan <zilin@seu.edu.cn>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cd576c83

drivers/crypto/starfive/jh7110-aes.c

+7 −2
Original line number Diff line number Diff line
@@ -669,9 +669,11 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq 
			return -ENOMEM;



		if (sg_copy_to_buffer(req->src, sg_nents_for_len(req->src, cryp->assoclen),

				      rctx->adata, cryp->assoclen) != cryp->assoclen)

				      rctx->adata, cryp->assoclen) != cryp->assoclen) {

			kfree(rctx->adata);

			return -EINVAL;

		}

	}



	if (cryp->total_in)

		sg_zero_buffer(rctx->in_sg, sg_nents(rctx->in_sg),
@@ -681,8 +683,11 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq 
	ctx->rctx = rctx;



	ret = starfive_aes_hw_init(ctx);

	if (ret)

	if (ret) {

		if (cryp->assoclen)

			kfree(rctx->adata);

		return ret;

	}



	if (!cryp->assoclen)

		goto write_text;