diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 15:34:38 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 15:35:36 +0200 |
commit | cd796018668d3f3f088c756a3b1a7f4f266a4e4b (patch) | |
tree | 621e49aa88ee2609689d7726b54d6524d9445442 /crypto/algapi.c | |
parent | 9b40a3dd3d4e3ff9904e049f6794c972b603272f (diff) | |
parent | 245c531351ef282b69bcd2bd7d46bfc79234f9b4 (diff) | |
download | linux-crypto-cd796018668d3f3f088c756a3b1a7f4f266a4e4b.tar.gz linux-crypto-cd796018668d3f3f088c756a3b1a7f4f266a4e4b.zip |
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
- keystone: add new driver
- hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
- gic: Use defines instead of magic number, preserve v2 bybass bits
- handle_domain_irq: common low level interrupt entry handler
Diffstat (limited to 'crypto/algapi.c')
-rw-r--r-- | crypto/algapi.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index 7a1ae87f..e8d3a7dc 100644 --- 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; |