summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-04-23 16:37:46 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-04-26 14:33:16 +0800
commit80f7b3552c1c925478a955fd4c700345beaf2982 (patch)
tree5652a9f00b827f100a533b843ed336c3584fff55 /crypto
parent26739535206e819946b0740347c09c94c4e48ba9 (diff)
downloadlinux-stable-80f7b3552c1c925478a955fd4c700345beaf2982.tar.gz
linux-stable-80f7b3552c1c925478a955fd4c700345beaf2982.tar.bz2
linux-stable-80f7b3552c1c925478a955fd4c700345beaf2982.zip
crypto: aead - Fix corner case in crypto_lookup_aead
When the user explicitly states that they don't care whether the algorithm has been tested (type = CRYPTO_ALG_TESTED and mask = 0), there is a corner case where we may erroneously return ENOENT. This patch fixes it by correcting the logic in the test. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/aead.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/aead.c b/crypto/aead.c
index 222271070b49..d6ad0c66ee83 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -489,7 +489,7 @@ struct crypto_alg *crypto_lookup_aead(const char *name, u32 type, u32 mask)
return alg;
if (alg->cra_type == &crypto_aead_type) {
- if ((alg->cra_flags ^ type ^ ~mask) & CRYPTO_ALG_TESTED) {
+ if (~alg->cra_flags & (type ^ ~mask) & CRYPTO_ALG_TESTED) {
crypto_mod_put(alg);
alg = ERR_PTR(-ENOENT);
}