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

Commit 1ccb39eb authored by Horia Geantă's avatar Horia Geantă Committed by Herbert Xu
Browse files

crypto: caam - update IV only when crypto operation succeeds 



skcipher encryption might fail and in some cases, like (invalid) input
length smaller then block size, updating the IV would lead to a useless
IV copy in case hardware issued an error.

Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarIuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1984aaee

drivers/crypto/caam/caamalg.c

+2 −3
Original line number Diff line number Diff line
@@ -990,10 +990,9 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err, 
	 * ciphertext block (CBC mode) or last counter (CTR mode).

	 * This is used e.g. by the CTS mode.

	 */

	if (ivsize) {

	if (ivsize && !ecode) {

		memcpy(req->iv, (u8 *)edesc->sec4_sg + edesc->sec4_sg_bytes,

		       ivsize);



		print_hex_dump_debug("dstiv  @"__stringify(__LINE__)": ",

				     DUMP_PREFIX_ADDRESS, 16, 4, req->iv,

				     edesc->src_nents > 1 ? 100 : ivsize, 1);
@@ -1030,7 +1029,7 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err, 
	 * ciphertext block (CBC mode) or last counter (CTR mode).

	 * This is used e.g. by the CTS mode.

	 */

	if (ivsize) {

	if (ivsize && !ecode) {

		memcpy(req->iv, (u8 *)edesc->sec4_sg + edesc->sec4_sg_bytes,

		       ivsize);

drivers/crypto/caam/caamalg_qi.c

+3 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,9 @@ static void skcipher_done(struct caam_drv_req *drv_req, u32 status) 
	 * ciphertext block (CBC mode) or last counter (CTR mode).

	 * This is used e.g. by the CTS mode.

	 */

	memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes, ivsize);

	if (!ecode)

		memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes,

		       ivsize);



	qi_cache_free(edesc);

	skcipher_request_complete(req, ecode);

drivers/crypto/caam/caamalg_qi2.c

+6 −2
Original line number Diff line number Diff line
@@ -1359,7 +1359,9 @@ static void skcipher_encrypt_done(void *cbk_ctx, u32 status) 
	 * ciphertext block (CBC mode) or last counter (CTR mode).

	 * This is used e.g. by the CTS mode.

	 */

	memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes, ivsize);

	if (!ecode)

		memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes,

		       ivsize);



	qi_cache_free(edesc);

	skcipher_request_complete(req, ecode);
@@ -1395,7 +1397,9 @@ static void skcipher_decrypt_done(void *cbk_ctx, u32 status) 
	 * ciphertext block (CBC mode) or last counter (CTR mode).

	 * This is used e.g. by the CTS mode.

	 */

	memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes, ivsize);

	if (!ecode)

		memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes,

		       ivsize);



	qi_cache_free(edesc);

	skcipher_request_complete(req, ecode);