[PATCH 2/8] crypto: aead - Use tmpl->create
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2015-05-23 07:41:52
Subsystem:
crypto api, the rest · Maintainers:
Herbert Xu, "David S. Miller", Linus Torvalds
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> --- crypto/aead.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/crypto/aead.c b/crypto/aead.c
index c1f73a9..a6385bd 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c@@ -572,6 +572,13 @@ static int crypto_nivaead_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))
@@ -583,6 +590,7 @@ static int crypto_nivaead_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;