Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59afdc7b authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: api - Move module sig ifdef into accessor function 



Currently we're hiding mod->sig_ok under an ifdef in open code.
This patch adds a module_sig_ok accessor function and removes that
ifdef.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 43a9607d

crypto/algapi.c

+1 −4
Original line number Diff line number Diff line
@@ -43,12 +43,9 @@ static inline int crypto_set_driver_name(struct crypto_alg *alg) 


static inline void crypto_check_module_sig(struct module *mod)

{

#ifdef CONFIG_CRYPTO_FIPS

	if (fips_enabled && mod && !mod->sig_ok)

	if (fips_enabled && mod && !module_sig_ok(mod))

		panic("Module %s signature verification failed in FIPS mode\n",

		      mod->name);

#endif

	return;

}



static int crypto_check_alg(struct crypto_alg *alg)

include/linux/module.h

+12 −0
Original line number Diff line number Diff line
@@ -655,4 +655,16 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr, 
static inline void module_bug_cleanup(struct module *mod) {}

#endif	/* CONFIG_GENERIC_BUG */



#ifdef CONFIG_MODULE_SIG

static inline bool module_sig_ok(struct module *module)

{

	return module->sig_ok;

}

#else	/* !CONFIG_MODULE_SIG */

static inline bool module_sig_ok(struct module *module)

{

	return true;

}

#endif	/* CONFIG_MODULE_SIG */



#endif /* _LINUX_MODULE_H */