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: Vakul Garg <vakul@freescale.com>
[reworded commit text, enhanced code readability]
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 339277c7acb9..c09ce1f040d3 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -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)