xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: skcipher - use crypto_grab_cipher() and simplify error paths

Browse Source 
Make skcipher_alloc_instance_simple() use the new function
crypto_grab_cipher() to initialize its cipher spawn.

This is needed to make all spawns be initialized in a consistent way.

Also simplify the error handling by taking advantage of crypto_drop_*()
now accepting (as a no-op) spawns that haven't been initialized yet, and
by taking advantage of crypto_grab_*() now handling ERR_PTR() names.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers
2020-01-02 19:59:00 -08:00
committed by Herbert Xu
parent c282586fc3
commit aacd5b4cfb
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
crypto/skcipher.c
View File

@@ -908,7 +908,7 @@ static void skcipher_exit_tfm_simple(struct crypto_skcipher *tfm)
static void skcipher_free_instance_simple(struct skcipher_instance *inst) static void skcipher_free_instance_simple(struct skcipher_instance *inst)
{ {
crypto_drop_spawn(skcipher_instance_ctx(inst)); crypto_drop_cipher(skcipher_instance_ctx(inst));
kfree(inst); kfree(inst);
} }
@@ -932,10 +932,10 @@ struct skcipher_instance *skcipher_alloc_instance_simple(
struct crypto_template *tmpl, struct rtattr **tb) struct crypto_template *tmpl, struct rtattr **tb)
{ {
struct crypto_attr_type *algt; struct crypto_attr_type *algt;
struct crypto_alg *cipher_alg;
struct skcipher_instance *inst;
struct crypto_spawn *spawn;
u32 mask; u32 mask;
struct skcipher_instance *inst;
struct crypto_cipher_spawn *spawn;
struct crypto_alg *cipher_alg;
int err; int err;
algt = crypto_get_attr_type(tb); algt = crypto_get_attr_type(tb);
@@ -945,32 +945,25 @@ struct skcipher_instance *skcipher_alloc_instance_simple(
if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask) if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
mask = CRYPTO_ALG_TYPE_MASK | mask = crypto_requires_off(algt->type, algt->mask,
crypto_requires_off(algt->type, algt->mask, CRYPTO_ALG_NEED_FALLBACK);
CRYPTO_ALG_NEED_FALLBACK);
cipher_alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, mask);
if (IS_ERR(cipher_alg))
return ERR_CAST(cipher_alg);
inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL); inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
if (!inst) { if (!inst)
err = -ENOMEM; return ERR_PTR(-ENOMEM);
goto err_put_cipher_alg;
}
spawn = skcipher_instance_ctx(inst); spawn = skcipher_instance_ctx(inst);
err = crypto_grab_cipher(spawn, skcipher_crypto_instance(inst),
crypto_attr_alg_name(tb[1]), 0, mask);
if (err)
goto err_free_inst;
cipher_alg = crypto_spawn_cipher_alg(spawn);
err = crypto_inst_setname(skcipher_crypto_instance(inst), tmpl->name, err = crypto_inst_setname(skcipher_crypto_instance(inst), tmpl->name,
cipher_alg); cipher_alg);
if (err) if (err)
goto err_free_inst; goto err_free_inst;
spawn->dropref = true;
err = crypto_init_spawn(spawn, cipher_alg,
skcipher_crypto_instance(inst),
CRYPTO_ALG_TYPE_MASK);
if (err)
goto err_free_inst;
inst->free = skcipher_free_instance_simple; inst->free = skcipher_free_instance_simple;
/* Default algorithm properties, can be overridden */ /* Default algorithm properties, can be overridden */
@@ -990,9 +983,7 @@ struct skcipher_instance *skcipher_alloc_instance_simple(
return inst; return inst;
err_free_inst: err_free_inst:
kfree(inst); skcipher_free_instance_simple(inst);
err_put_cipher_alg:
crypto_mod_put(cipher_alg);
return ERR_PTR(err); return ERR_PTR(err);
} }
EXPORT_SYMBOL_GPL(skcipher_alloc_instance_simple); EXPORT_SYMBOL_GPL(skcipher_alloc_instance_simple);

4
include/crypto/internal/skcipher.h
View File

@@ -214,9 +214,9 @@ struct skcipher_instance *skcipher_alloc_instance_simple(
static inline struct crypto_alg *skcipher_ialg_simple( static inline struct crypto_alg *skcipher_ialg_simple(
struct skcipher_instance *inst) struct skcipher_instance *inst)
{ {
struct crypto_spawn *spawn = skcipher_instance_ctx(inst); struct crypto_cipher_spawn *spawn = skcipher_instance_ctx(inst);
return spawn->alg; return crypto_spawn_cipher_alg(spawn);
} }
#endif /* _CRYPTO_INTERNAL_SKCIPHER_H */ #endif /* _CRYPTO_INTERNAL_SKCIPHER_H */