Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ee991be authored by Gary R Hook's avatar Gary R Hook Committed by Herbert Xu
Browse files

crypto: ccp - Fill the result buffer only on digest, finup, and final ops 



Any change to the result buffer should only happen on final, finup
and digest operations. Changes to the buffer for update, import, export,
etc, are not allowed.

Fixes: 66d7b9f6175e ("crypto: testmgr - test misuse of result in ahash")
Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9cc16b4d

drivers/crypto/ccp/ccp-crypto-aes-cmac.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int ccp_aes_cmac_complete(struct crypto_async_request *async_req, 
	}



	/* Update result area if supplied */

	if (req->result)

	if (req->result && rctx->final)

		memcpy(req->result, rctx->iv, digest_size);



e_free:

drivers/crypto/ccp/ccp-crypto-sha.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static int ccp_sha_complete(struct crypto_async_request *async_req, int ret) 
	}



	/* Update result area if supplied */

	if (req->result)

	if (req->result && rctx->final)

		memcpy(req->result, rctx->ctx, digest_size);



e_free: