瀏覽代碼

crypto: caam - defer aead_set_sh_desc in case of zero authsize

To be able to generate shared descriptors for AEAD, the authentication size
needs to be known. However, there is no imposed order of calling .setkey,
.setauthsize callbacks.

Thus, in case authentication size is not known at .setkey time, defer it
until .setauthsize is called.

The authsize != 0 check was incorrectly removed when converting the driver
to the new AEAD interface.

Cc: <stable@vger.kernel.org> # 4.3+
Fixes: 479bcc7c5b9e ("crypto: caam - Convert authenc to new AEAD interface")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Horia Geantă 9 年之前
父節點
當前提交
2fdea258fd
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/crypto/caam/caamalg.c

+ 3 - 0
drivers/crypto/caam/caamalg.c

@@ -441,6 +441,9 @@ static int aead_set_sh_desc(struct crypto_aead *aead)
 			       OP_ALG_AAI_CTR_MOD128);
 			       OP_ALG_AAI_CTR_MOD128);
 	const bool is_rfc3686 = alg->caam.rfc3686;
 	const bool is_rfc3686 = alg->caam.rfc3686;
 
 
+	if (!ctx->authsize)
+		return 0;
+
 	/* NULL encryption / decryption */
 	/* NULL encryption / decryption */
 	if (!ctx->enckeylen)
 	if (!ctx->enckeylen)
 		return aead_null_set_sh_desc(aead);
 		return aead_null_set_sh_desc(aead);