summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-04-23 16:34:47 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-04-26 14:33:15 +0800
commit26739535206e819946b0740347c09c94c4e48ba9 (patch)
tree678fc485236b97f801f33d2ee1c2b32eb84df2e1
parentbd4a7c69aaed79ae1a299db8063fe4daf5e4a2f1 (diff)
downloadop-kernel-dev-26739535206e819946b0740347c09c94c4e48ba9.zip
op-kernel-dev-26739535206e819946b0740347c09c94c4e48ba9.tar.gz
crypto: skcipher - Fix corner case in crypto_lookup_skcipher
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>
-rw-r--r--crypto/ablkcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index db201bca..b3dded4 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -636,7 +636,7 @@ struct crypto_alg *crypto_lookup_skcipher(const char *name, u32 type, u32 mask)
if ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
CRYPTO_ALG_TYPE_GIVCIPHER) {
- 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);
}
OpenPOWER on IntegriCloud