diff options
author | Eric Biggers <ebiggers@google.com> | 2020-01-02 19:58:46 -0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-01-09 11:30:54 +0800 |
commit | 98ecca72e63548b208184db56904eadeb6c647ce (patch) | |
tree | 1d0a000c864bff8772761b8e62e51e6d41487872 /crypto/aead.c | |
parent | 4421083bc0f01da380967ffab5e017f3d641af9d (diff) | |
download | linux-crypto-98ecca72e63548b208184db56904eadeb6c647ce.tar.gz linux-crypto-98ecca72e63548b208184db56904eadeb6c647ce.zip |
crypto: aead - pass instance to crypto_grab_aead()
Initializing a crypto_aead_spawn currently requires:
1. Set spawn->base.inst to point to the instance.
2. Call crypto_grab_aead().
But there's no reason for these steps to be separate, and in fact this
unneeded complication has caused at least one bug, the one fixed by
commit 4155904c1677 ("crypto: adiantum - initialize crypto_spawn::inst")
So just make crypto_grab_aead() take the instance as an argument.
To keep the function calls from getting too unwieldy due to this extra
argument, also introduce a 'mask' variable into the affected places
which weren't already using one.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/aead.c')
-rw-r--r-- | crypto/aead.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 47f16d13..c7135e00 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -207,9 +207,11 @@ static const struct crypto_type crypto_aead_type = { .tfmsize = offsetof(struct crypto_aead, base), }; -int crypto_grab_aead(struct crypto_aead_spawn *spawn, const char *name, - u32 type, u32 mask) +int crypto_grab_aead(struct crypto_aead_spawn *spawn, + struct crypto_instance *inst, + const char *name, u32 type, u32 mask) { + spawn->base.inst = inst; spawn->base.frontend = &crypto_aead_type; return crypto_grab_spawn(&spawn->base, name, type, mask); } |