ARM64: dts: rk3328-evb: enable gpu device

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

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 6149a6e09643f0c9b975ac339dd904dd58421262..43f5bdb6b57084e35e065dc28935f0869c258bac 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -12,6 +12,7 @@
 
 #include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/fips.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
@@ -41,8 +42,17 @@ static inline int crypto_set_driver_name(struct crypto_alg *alg)
        return 0;
 }
 
+static inline void crypto_check_module_sig(struct module *mod)
+{
+       if (fips_enabled && mod && !module_sig_ok(mod))
+               panic("Module %s signature verification failed in FIPS mode\n",
+                     module_name(mod));
+}
+
 static int crypto_check_alg(struct crypto_alg *alg)
 {
+       crypto_check_module_sig(alg->cra_module);
+
        if (alg->cra_alignmask & (alg->cra_alignmask + 1))
                return -EINVAL;
 
@@ -52,15 +62,27 @@ static int crypto_check_alg(struct crypto_alg *alg)
        if (alg->cra_priority < 0)
                return -EINVAL;
 
+       atomic_set(&alg->cra_refcnt, 1);
+
        return crypto_set_driver_name(alg);
 }
 
+static void crypto_free_instance(struct crypto_instance *inst)
+{
+       if (!inst->alg.cra_type->free) {
+               inst->tmpl->free(inst);
+               return;
+       }
+
+       inst->alg.cra_type->free(inst);
+}
+
 static void crypto_destroy_instance(struct crypto_alg *alg)
 {
        struct crypto_instance *inst = (void *)alg;
        struct crypto_template *tmpl = inst->tmpl;
 
-       tmpl->free(inst);
+       crypto_free_instance(inst);
        crypto_tmpl_put(tmpl);
 }
 
@@ -87,10 +109,9 @@ static struct list_head *crypto_more_spawns(struct crypto_alg *alg,
        return &n->list == stack ? top : &n->inst->alg.cra_users;
 }
 
-static void crypto_remove_spawn(struct crypto_spawn *spawn,
-                               struct list_head *list)
+static void crypto_remove_instance(struct crypto_instance *inst,
+                                  struct list_head *list)
 {
-       struct crypto_instance *inst = spawn->inst;
        struct crypto_template *tmpl = inst->tmpl;
 
        if (crypto_is_dead(&inst->alg))
@@ -155,7 +176,7 @@ void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list,
                if (spawn->alg)
                        list_move(&spawn->list, &spawn->alg->cra_users);
                else
-                       crypto_remove_spawn(spawn, list);
+                       crypto_remove_instance(spawn->inst, list);
        }
 }
 EXPORT_SYMBOL_GPL(crypto_remove_spawns);
@@ -176,7 +197,6 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
 
        ret = -EEXIST;
 
-       atomic_set(&alg->cra_refcnt, 1);
        list_for_each_entry(q, &crypto_alg_list, cra_list) {
                if (q == alg)
                        goto err;
@@ -325,7 +345,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)
                crypto_alg_tested(larval->alg.cra_driver_name, 0);
        }
 
-       err = wait_for_completion_interruptible(&larval->completion);
+       err = wait_for_completion_killable(&larval->completion);
        WARN_ON(err);
 
 out:
@@ -337,6 +357,7 @@ int crypto_register_alg(struct crypto_alg *alg)
        struct crypto_larval *larval;
        int err;
 
+       alg->cra_flags &= ~CRYPTO_ALG_DEAD;
        err = crypto_check_alg(alg);
        if (err)
                return err;
@@ -430,6 +451,8 @@ int crypto_register_template(struct crypto_template *tmpl)
 
        down_write(&crypto_alg_sem);
 
+       crypto_check_module_sig(tmpl->module);
+
        list_for_each_entry(q, &crypto_template_list, list) {
                if (q == tmpl)
                        goto out;
@@ -459,6 +482,7 @@ void crypto_unregister_template(struct crypto_template *tmpl)
        list = &tmpl->instances;
        hlist_for_each_entry(inst, list, list) {
                int err = crypto_remove_alg(&inst->alg, &users);
+
                BUG_ON(err);
        }
 
@@ -468,7 +492,7 @@ void crypto_unregister_template(struct crypto_template *tmpl)
 
        hlist_for_each_entry_safe(inst, n, list, list) {
                BUG_ON(atomic_read(&inst->alg.cra_refcnt) != 1);
-               tmpl->free(inst);
+               crypto_free_instance(inst);
        }
        crypto_remove_final(&users);
 }
@@ -495,7 +519,8 @@ static struct crypto_template *__crypto_lookup_template(const char *name)
 
 struct crypto_template *crypto_lookup_template(const char *name)
 {
-       return try_then_request_module(__crypto_lookup_template(name), name);
+       return try_then_request_module(__crypto_lookup_template(name),
+                                      "crypto-%s", name);
 }
 EXPORT_SYMBOL_GPL(crypto_lookup_template);
 
@@ -507,11 +532,14 @@ int crypto_register_instance(struct crypto_template *tmpl,
 
        err = crypto_check_alg(&inst->alg);
        if (err)
-               goto err;
+               return err;
 
        inst->alg.cra_module = tmpl->module;
        inst->alg.cra_flags |= CRYPTO_ALG_INSTANCE;
 
+       if (unlikely(!crypto_mod_get(&inst->alg)))
+               return -EAGAIN;
+
        down_write(&crypto_alg_sem);
 
        larval = __crypto_register_alg(&inst->alg);
@@ -529,37 +557,30 @@ unlock:
                goto err;
 
        crypto_wait_for_test(larval);
+
+       /* Remove instance if test failed */
+       if (!(inst->alg.cra_flags & CRYPTO_ALG_TESTED))
+               crypto_unregister_instance(inst);
        err = 0;
 
 err:
+       crypto_mod_put(&inst->alg);
        return err;
 }
 EXPORT_SYMBOL_GPL(crypto_register_instance);
 
-int crypto_unregister_instance(struct crypto_alg *alg)
+int crypto_unregister_instance(struct crypto_instance *inst)
 {
-       int err;
-       struct crypto_instance *inst = (void *)alg;
-       struct crypto_template *tmpl = inst->tmpl;
-       LIST_HEAD(users);
-
-       if (!(alg->cra_flags & CRYPTO_ALG_INSTANCE))
-               return -EINVAL;
-
-       BUG_ON(atomic_read(&alg->cra_refcnt) != 1);
+       LIST_HEAD(list);
 
        down_write(&crypto_alg_sem);
 
-       hlist_del_init(&inst->list);
-       err = crypto_remove_alg(alg, &users);
+       crypto_remove_spawns(&inst->alg, &list, NULL);
+       crypto_remove_instance(inst, &list);
 
        up_write(&crypto_alg_sem);
 
-       if (err)
-               return err;
-
-       tmpl->free(inst);
-       crypto_remove_final(&users);
+       crypto_remove_final(&list);
 
        return 0;
 }
@@ -602,6 +623,22 @@ out:
 }
 EXPORT_SYMBOL_GPL(crypto_init_spawn2);
 
+int crypto_grab_spawn(struct crypto_spawn *spawn, const char *name,
+                     u32 type, u32 mask)
+{
+       struct crypto_alg *alg;
+       int err;
+
+       alg = crypto_find_alg(name, spawn->frontend, type, mask);
+       if (IS_ERR(alg))
+               return PTR_ERR(alg);
+
+       err = crypto_init_spawn(spawn, alg, spawn->inst, mask);
+       crypto_mod_put(alg);
+       return err;
+}
+EXPORT_SYMBOL_GPL(crypto_grab_spawn);
+
 void crypto_drop_spawn(struct crypto_spawn *spawn)
 {
        if (!spawn->alg)
@@ -866,7 +903,7 @@ out:
 }
 EXPORT_SYMBOL_GPL(crypto_enqueue_request);
 
-void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset)
+struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)
 {
        struct list_head *request;
 
@@ -881,14 +918,7 @@ void *__crypto_dequeue_request(struct crypto_queue *queue, unsigned int offset)
        request = queue->list.next;
        list_del(request);
 
-       return (char *)list_entry(request, struct crypto_async_request, list) -
-              offset;
-}
-EXPORT_SYMBOL_GPL(__crypto_dequeue_request);
-
-struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)
-{
-       return __crypto_dequeue_request(queue, 0);
+       return list_entry(request, struct crypto_async_request, list);
 }
 EXPORT_SYMBOL_GPL(crypto_dequeue_request);
 
@@ -952,6 +982,13 @@ void crypto_xor(u8 *dst, const u8 *src, unsigned int size)
 }
 EXPORT_SYMBOL_GPL(crypto_xor);
 
+unsigned int crypto_alg_extsize(struct crypto_alg *alg)
+{
+       return alg->cra_ctxsize +
+              (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
+}
+EXPORT_SYMBOL_GPL(crypto_alg_extsize);
+
 static int __init crypto_algapi_init(void)
 {
        crypto_init_proc();