diff options
| author | Eric Biggers | 2020-01-02 19:58:45 -0800 |
|---|---|---|
| committer | Herbert Xu | 2020-01-09 11:30:54 +0800 |
| commit | b9f76dddb1f9f70e008b982381bbc9a67c9b8c66 (patch) | |
| tree | 329d8484b8eace9777db4e9965b02372c79e1a9f /crypto/cryptd.c | |
| parent | 77f7e94d72208a1a84c88ed4de16a9bf368e9ded (diff) | |
crypto: skcipher - pass instance to crypto_grab_skcipher()
Initializing a crypto_skcipher_spawn currently requires:
1. Set spawn->base.inst to point to the instance.
2. Call crypto_grab_skcipher().
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 6db43410179b ("crypto: adiantum - initialize crypto_spawn::inst")
So just make crypto_grab_skcipher() 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/cryptd.c')
| -rw-r--r-- | crypto/cryptd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c index cd94243a1605..a0fe10624cfd 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c @@ -416,8 +416,8 @@ static int cryptd_create_skcipher(struct crypto_template *tmpl, ctx = skcipher_instance_ctx(inst); ctx->queue = queue; - crypto_set_skcipher_spawn(&ctx->spawn, skcipher_crypto_instance(inst)); - err = crypto_grab_skcipher(&ctx->spawn, name, type, mask); + err = crypto_grab_skcipher(&ctx->spawn, skcipher_crypto_instance(inst), + name, type, mask); if (err) goto out_free_inst; |