Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / crypto / chainiv.c

diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index be0bd521c46f1fa3cda099e3c88f69d26e569a64..b4340018c8d47527068a65142876ac86e8728701 100644 (file)
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
@@ -83,21 +83,34 @@ unlock:
 static int chainiv_init_common(struct crypto_tfm *tfm, char iv[])
 {
        struct crypto_ablkcipher *geniv = __crypto_ablkcipher_cast(tfm);
+       int err = 0;
 
        tfm->crt_ablkcipher.reqsize = sizeof(struct ablkcipher_request);
 
-       return crypto_rng_get_bytes(crypto_default_rng, iv,
-                                   crypto_ablkcipher_ivsize(geniv)) ?:
-              skcipher_geniv_init(tfm);
+       if (iv) {
+               err = crypto_rng_get_bytes(crypto_default_rng, iv,
+                                          crypto_ablkcipher_ivsize(geniv));
+               crypto_put_default_rng();
+       }
+
+       return err ?: skcipher_geniv_init(tfm);
 }
 
 static int chainiv_init(struct crypto_tfm *tfm)
 {
+       struct crypto_ablkcipher *geniv = __crypto_ablkcipher_cast(tfm);
        struct chainiv_ctx *ctx = crypto_tfm_ctx(tfm);
+       char *iv;
 
        spin_lock_init(&ctx->lock);
 
-       return chainiv_init_common(tfm, ctx->iv);
+       iv = NULL;
+       if (!crypto_get_default_rng()) {
+               crypto_ablkcipher_crt(geniv)->givencrypt = chainiv_givencrypt;
+               iv = ctx->iv;
+       }
+
+       return chainiv_init_common(tfm, iv);
 }
 
 static int async_chainiv_schedule_work(struct async_chainiv_ctx *ctx)
@@ -216,14 +229,23 @@ static void async_chainiv_do_postponed(struct work_struct *work)
 
 static int async_chainiv_init(struct crypto_tfm *tfm)
 {
+       struct crypto_ablkcipher *geniv = __crypto_ablkcipher_cast(tfm);
        struct async_chainiv_ctx *ctx = crypto_tfm_ctx(tfm);
+       char *iv;
 
        spin_lock_init(&ctx->lock);
 
        crypto_init_queue(&ctx->queue, 100);
        INIT_WORK(&ctx->postponed, async_chainiv_do_postponed);
 
-       return chainiv_init_common(tfm, ctx->iv);
+       iv = NULL;
+       if (!crypto_get_default_rng()) {
+               crypto_ablkcipher_crt(geniv)->givencrypt =
+                       async_chainiv_givencrypt;
+               iv = ctx->iv;
+       }
+
+       return chainiv_init_common(tfm, iv);
 }
 
 static void async_chainiv_exit(struct crypto_tfm *tfm)
@@ -241,21 +263,14 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)
 {
        struct crypto_attr_type *algt;
        struct crypto_instance *inst;
-       int err;
 
        algt = crypto_get_attr_type(tb);
        if (IS_ERR(algt))
                return ERR_CAST(algt);
 
-       err = crypto_get_default_rng();
-       if (err)
-               return ERR_PTR(err);
-
        inst = skcipher_geniv_alloc(&chainiv_tmpl, tb, 0, 0);
        if (IS_ERR(inst))
-               goto put_rng;
-
-       inst->alg.cra_ablkcipher.givencrypt = chainiv_givencrypt;
+               goto out;
 
        inst->alg.cra_init = chainiv_init;
        inst->alg.cra_exit = skcipher_geniv_exit;
@@ -265,8 +280,6 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)
        if (!crypto_requires_sync(algt->type, algt->mask)) {
                inst->alg.cra_flags |= CRYPTO_ALG_ASYNC;
 
-               inst->alg.cra_ablkcipher.givencrypt = async_chainiv_givencrypt;
-
                inst->alg.cra_init = async_chainiv_init;
                inst->alg.cra_exit = async_chainiv_exit;
 
@@ -277,22 +290,12 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)
 
 out:
        return inst;
-
-put_rng:
-       crypto_put_default_rng();
-       goto out;
-}
-
-static void chainiv_free(struct crypto_instance *inst)
-{
-       skcipher_geniv_free(inst);
-       crypto_put_default_rng();
 }
 
 static struct crypto_template chainiv_tmpl = {
        .name = "chainiv",
        .alloc = chainiv_alloc,
-       .free = chainiv_free,
+       .free = skcipher_geniv_free,
        .module = THIS_MODULE,
 };