Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 7a1ae87..e8d3a7d 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -41,8 +41,20 @@ static inline int crypto_set_driver_name(struct crypto_alg *alg)
        return 0;
 }
 
+static inline void crypto_check_module_sig(struct module *mod)
+{
+#ifdef CONFIG_CRYPTO_FIPS
+       if (fips_enabled && mod && !mod->sig_ok)
+               panic("Module %s signature verification failed in FIPS mode\n",
+                     mod->name);
+#endif
+       return;
+}
+
 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;
 
@@ -430,6 +442,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;