diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-23 15:41:48 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-25 18:41:28 +0800 |
| commit | 56e34378bbbb7af21cf73d98a92c0411386e091c (patch) | |
| tree | c0e5887447e1edbe6b376668c2292380c3375748 /crypto/ablkcipher.c | |
| parent | 622ff8752756d4fbbf7975d9ef27a1a07820f55e (diff) | |
| download | linux-stable-56e34378bbbb7af21cf73d98a92c0411386e091c.tar.gz linux-stable-56e34378bbbb7af21cf73d98a92c0411386e091c.tar.bz2 linux-stable-56e34378bbbb7af21cf73d98a92c0411386e091c.zip | |
crypto: skcipher - Use tmpl->create
Newer templates use tmpl->create and have a NULL tmpl->alloc. So
we must use tmpl->create if it is set.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/ablkcipher.c')
| -rw-r--r-- | crypto/ablkcipher.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index b3dded4558c1..b15d797f94f9 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c @@ -586,6 +586,13 @@ static int crypto_givcipher_default(struct crypto_alg *alg, u32 type, u32 mask) if (!tmpl) goto kill_larval; + if (tmpl->create) { + err = tmpl->create(tmpl, tb); + if (err) + goto put_tmpl; + goto ok; + } + inst = tmpl->alloc(tb); err = PTR_ERR(inst); if (IS_ERR(inst)) @@ -597,6 +604,7 @@ static int crypto_givcipher_default(struct crypto_alg *alg, u32 type, u32 mask) goto put_tmpl; } +ok: /* Redo the lookup to use the instance we just registered. */ err = -EAGAIN; |