diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-06-15 22:27:05 +0800 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-16 08:25:05 -0400 |
commit | 843137840f140051965e0611fa95c831b5064737 (patch) | |
tree | d3351bb2c9855074c3922a0ce787af311b1f0cb1 | |
parent | b42d3789eeabb4bdbe295645abc82d11b04db184 (diff) | |
download | linux-exynos-843137840f140051965e0611fa95c831b5064737.tar.gz linux-exynos-843137840f140051965e0611fa95c831b5064737.tar.bz2 linux-exynos-843137840f140051965e0611fa95c831b5064737.zip |
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>
-rw-r--r-- | crypto/gcm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index 2e403f6138c1..ee3c29bd7ddb 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); |