diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:23:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:23:58 -0500 |
commit | 7f4da8dfc74c2b4fb7191819ee718a78a0ca972b (patch) | |
tree | 621e49aa88ee2609689d7726b54d6524d9445442 /crypto/algapi.c | |
parent | 6adc8f59727d07e7dcbc6d0c1116719c4c4042a9 (diff) | |
parent | 245c531351ef282b69bcd2bd7d46bfc79234f9b4 (diff) | |
download | linux-crypto-7f4da8dfc74c2b4fb7191819ee718a78a0ca972b.tar.gz linux-crypto-7f4da8dfc74c2b4fb7191819ee718a78a0ca972b.zip |
Merge tag 'v3.17-rc1' into patchwork
Linux 3.17-rc1
Diffstat (limited to '')
-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; |