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

Commit 80cd88f2 authored by Vakul Garg's avatar Vakul Garg Committed by Herbert Xu
Browse files

crypto: caam - reinitialize keys_fit_inline for decrypt and givencrypt 



Re-initialize keys_fit_inline to avoid using its stale encrypt() shared
descriptor value prior to building descriptors for the decrypt() and
givencrypt() cases.

Signed-off-by: default avatarVakul Garg <vakul@freescale.com>
[reworded commit text, enhanced code readability]
Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 56b28446

drivers/crypto/caam/caamalg.c

+3 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ static int aead_null_set_sh_desc(struct crypto_aead *aead) 
	 * Job Descriptor and Shared Descriptors

	 * must all fit into the 64-word Descriptor h/w Buffer

	 */

	keys_fit_inline = false;

	if (DESC_AEAD_NULL_DEC_LEN + DESC_JOB_IO_LEN +

	    ctx->split_key_pad_len <= CAAM_DESC_BYTES_MAX)

		keys_fit_inline = true;
@@ -472,6 +473,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	 * Job Descriptor and Shared Descriptors

	 * must all fit into the 64-word Descriptor h/w Buffer

	 */

	keys_fit_inline = false;

	if (DESC_AEAD_DEC_LEN + DESC_JOB_IO_LEN +

	    ctx->split_key_pad_len + ctx->enckeylen <=

	    CAAM_DESC_BYTES_MAX)
@@ -527,6 +529,7 @@ static int aead_set_sh_desc(struct crypto_aead *aead) 
	 * Job Descriptor and Shared Descriptors

	 * must all fit into the 64-word Descriptor h/w Buffer

	 */

	keys_fit_inline = false;

	if (DESC_AEAD_GIVENC_LEN + DESC_JOB_IO_LEN +

	    ctx->split_key_pad_len + ctx->enckeylen <=

	    CAAM_DESC_BYTES_MAX)