Commit 8a0d929b authored by Jia Jie Ho's avatar Jia Jie Ho Committed by Herbert Xu
Browse files

crypto: starfive - Pad adata with zeroes 



Aad requires padding with zeroes up to 15 bytes in some cases. This
patch increases the allocated buffer size for aad and prevents the
driver accessing uninitialized memory region.

v1->v2: Specify reason for alloc size change in descriptions.

Signed-off-by: default avatarJia Jie Ho <jiajie.ho@starfivetech.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cc03a934

drivers/crypto/starfive/jh7110-aes.c

+4 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int starfive_aes_prepare_req(struct skcipher_request *req, 
	scatterwalk_start(&cryp->out_walk, rctx->out_sg);



	if (cryp->assoclen) {

		rctx->adata = kzalloc(ALIGN(cryp->assoclen, AES_BLOCK_SIZE), GFP_KERNEL);

		rctx->adata = kzalloc(cryp->assoclen + AES_BLOCK_SIZE, GFP_KERNEL);

		if (!rctx->adata)

			return dev_err_probe(cryp->dev, -ENOMEM,

					     "Failed to alloc memory for adata");
@@ -569,7 +569,7 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq 
	struct starfive_cryp_ctx *ctx =

		crypto_aead_ctx(crypto_aead_reqtfm(req));

	struct starfive_cryp_dev *cryp = ctx->cryp;

	struct starfive_cryp_request_ctx *rctx = ctx->rctx;

	struct starfive_cryp_request_ctx *rctx;

	u32 block[AES_BLOCK_32];

	u32 stat;

	int err;
@@ -579,6 +579,8 @@ static int starfive_aes_aead_do_one_req(struct crypto_engine *engine, void *areq 
	if (err)

		return err;



	rctx = ctx->rctx;



	if (!cryp->assoclen)

		goto write_text;