summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-11-14 15:21:11 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2018-11-20 01:26:55 -0500
commit3d234b3313cd12157946522fe35f5a4574f31169 (patch)
tree7d7f105aaa99a8d2c21d9e1d996330dcf95c40c6 /fs/ubifs
parent1ad0f1603a6b2afb62a1c065409aaa4e43ca7627 (diff)
crypto: drop mask=CRYPTO_ALG_ASYNC from 'shash' tfm allocations
'shash' algorithms are always synchronous, so passing CRYPTO_ALG_ASYNC in the mask to crypto_alloc_shash() has no effect. Many users therefore already don't pass it, but some still do. This inconsistency can cause confusion, especially since the way the 'mask' argument works is somewhat counterintuitive. Thus, just remove the unneeded CRYPTO_ALG_ASYNC flags. This patch shouldn't change any actual behavior. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/auth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ubifs/auth.c b/fs/ubifs/auth.c
index 124e965a28b3..5bf5fd08879e 100644
--- a/fs/ubifs/auth.c
+++ b/fs/ubifs/auth.c
@@ -269,8 +269,7 @@ int ubifs_init_authentication(struct ubifs_info *c)
269 goto out; 269 goto out;
270 } 270 }
271 271
272 c->hash_tfm = crypto_alloc_shash(c->auth_hash_name, 0, 272 c->hash_tfm = crypto_alloc_shash(c->auth_hash_name, 0, 0);
273 CRYPTO_ALG_ASYNC);
274 if (IS_ERR(c->hash_tfm)) { 273 if (IS_ERR(c->hash_tfm)) {
275 err = PTR_ERR(c->hash_tfm); 274 err = PTR_ERR(c->hash_tfm);
276 ubifs_err(c, "Can not allocate %s: %d", 275 ubifs_err(c, "Can not allocate %s: %d",
@@ -286,7 +285,7 @@ int ubifs_init_authentication(struct ubifs_info *c)
286 goto out_free_hash; 285 goto out_free_hash;
287 } 286 }
288 287
289 c->hmac_tfm = crypto_alloc_shash(hmac_name, 0, CRYPTO_ALG_ASYNC); 288 c->hmac_tfm = crypto_alloc_shash(hmac_name, 0, 0);
290 if (IS_ERR(c->hmac_tfm)) { 289 if (IS_ERR(c->hmac_tfm)) {
291 err = PTR_ERR(c->hmac_tfm); 290 err = PTR_ERR(c->hmac_tfm);
292 ubifs_err(c, "Can not allocate %s: %d", hmac_name, err); 291 ubifs_err(c, "Can not allocate %s: %d", hmac_name, err);