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 | cd900f0cacd7601dabdd028e8cbdbf2a7041cee2 (patch) | |
tree | ee7a4e59f6dd405c03d544ec877f3f33ec3ba685 /crypto/pcrypt.c | |
parent | b9f76dddb1f9f70e008b982381bbc9a67c9b8c66 (diff) | |
download | linux-cd900f0cacd7601dabdd028e8cbdbf2a7041cee2.tar.gz linux-cd900f0cacd7601dabdd028e8cbdbf2a7041cee2.tar.bz2 linux-cd900f0cacd7601dabdd028e8cbdbf2a7041cee2.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 6db43410179b ("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/pcrypt.c')
-rw-r--r-- | crypto/pcrypt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index d6696e217128..1b632139a8c1 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -258,9 +258,8 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb, if (!ctx->psdec) goto out_free_psenc; - crypto_set_aead_spawn(&ctx->spawn, aead_crypto_instance(inst)); - - err = crypto_grab_aead(&ctx->spawn, name, 0, 0); + err = crypto_grab_aead(&ctx->spawn, aead_crypto_instance(inst), + name, 0, 0); if (err) goto out_free_psdec; |