renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-05 03:44:03 +08:00
Code

crypto: algapi - fold crypto_init_spawn() into crypto_grab_spawn()

Browse Source 
Now that crypto_init_spawn() is only called by crypto_grab_spawn(),
simplify things by moving its functionality into crypto_grab_spawn().

In the process of doing this, also be more consistent about when the
spawn and instance are updated, and remove the crypto_spawn::dropref
flag since now it's always set.

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:08 -08:00 committed by Herbert Xu
parent 6d1b41fce0
commit aed11cf57d
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
crypto/algapi.c
View File

@ -629,8 +629,7 @@ int crypto_register_instance(struct crypto_template *tmpl,
spawn->inst = inst;
spawn->registered = true;
if (spawn->dropref)
crypto_mod_put(spawn->alg);
crypto_mod_put(spawn->alg);
spawn = next;
}
@ -672,36 +671,14 @@ void crypto_unregister_instance(struct crypto_instance *inst)
}
EXPORT_SYMBOL_GPL(crypto_unregister_instance);
int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
struct crypto_instance *inst, u32 mask)
{
int err = -EAGAIN;
if (WARN_ON_ONCE(inst == NULL))
return -EINVAL;
spawn->next = inst->spawns;
inst->spawns = spawn;
spawn->mask = mask;
down_write(&crypto_alg_sem);
if (!crypto_is_moribund(alg)) {
list_add(&spawn->list, &alg->cra_users);
spawn->alg = alg;
err = 0;
}
up_write(&crypto_alg_sem);
return err;
}
EXPORT_SYMBOL_GPL(crypto_init_spawn);
int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
const char *name, u32 type, u32 mask)
{
struct crypto_alg *alg;
int err;
int err = -EAGAIN;
if (WARN_ON_ONCE(inst == NULL))
return -EINVAL;
/* Allow the result of crypto_attr_alg_name() to be passed directly */
if (IS_ERR(name))
@ -711,8 +688,16 @@ int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
if (IS_ERR(alg))
return PTR_ERR(alg);
spawn->dropref = true;
err = crypto_init_spawn(spawn, alg, inst, mask);
down_write(&crypto_alg_sem);
if (!crypto_is_moribund(alg)) {
list_add(&spawn->list, &alg->cra_users);
spawn->alg = alg;
spawn->mask = mask;
spawn->next = inst->spawns;
inst->spawns = spawn;
err = 0;
}
up_write(&crypto_alg_sem);
if (err)
crypto_mod_put(alg);
return err;
@ -729,7 +714,7 @@ void crypto_drop_spawn(struct crypto_spawn *spawn)
list_del(&spawn->list);
up_write(&crypto_alg_sem);
if (spawn->dropref && !spawn->registered)
if (!spawn->registered)
crypto_mod_put(spawn->alg);
}
EXPORT_SYMBOL_GPL(crypto_drop_spawn);

3
include/crypto/algapi.h
View File

@ -82,7 +82,6 @@ struct crypto_spawn {
const struct crypto_type *frontend;
u32 mask;
bool dead;
bool dropref;
bool registered;
};
@ -111,8 +110,6 @@ int crypto_register_instance(struct crypto_template *tmpl,
struct crypto_instance *inst);
void crypto_unregister_instance(struct crypto_instance *inst);
int crypto_init_spawn(struct crypto_spawn *spawn, struct crypto_alg *alg,
struct crypto_instance *inst, u32 mask);
int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
const char *name, u32 type, u32 mask);
void crypto_drop_spawn(struct crypto_spawn *spawn);