From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 15 Jun 2016 14:27:05 +0000 (+0800)
Subject: crypto: gcm - Filter out async ghash if necessary
X-Git-Tag: v4.1.12-92~22^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=726778b24fae46cce981bd937c1f460a56e3ac94;p=users%2Fjedix%2Flinux-maple.git

crypto: gcm - Filter out async ghash if necessary

[ Upstream commit b30bdfa86431afbafe15284a3ad5ac19b49b88e3 ]

As it is if you ask for a sync gcm you may actually end up with
an async one because it does not filter out async implementations
of ghash.

This patch fixes this by adding the necessary filter when looking
for ghash.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit 843137840f140051965e0611fa95c831b5064737)
Signed-off-by: Todd Vierling <todd.vierling@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
---

diff --git a/crypto/gcm.c b/crypto/gcm.c
index 2e403f6138c14..ee3c29bd7ddb2 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -716,7 +716,9 @@ static struct crypto_instance *crypto_gcm_alloc_common(struct rtattr **tb,
 
 	ghash_alg = crypto_find_alg(ghash_name, &crypto_ahash_type,
 				    CRYPTO_ALG_TYPE_HASH,
-				    CRYPTO_ALG_TYPE_AHASH_MASK);
+				    CRYPTO_ALG_TYPE_AHASH_MASK |
+				    crypto_requires_sync(algt->type,
+							 algt->mask));
 	if (IS_ERR(ghash_alg))
 		return ERR_CAST(ghash_alg);