Commit 8fc5f2ad authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: testmgr - Move crypto_simd_disabled_for_test out 



As testmgr is part of cryptomgr which was designed to be unloadable
as a module, it shouldn't export any symbols for other crypto
modules to use as that would prevent it from being unloaded.  All
its functionality is meant to be accessed through notifiers.

The symbol crypto_simd_disabled_for_test was added to testmgr
which caused it to be pinned as a module if its users were also
loaded.  This patch moves it out of testmgr and into crypto/algapi.c
so cryptomgr can again be unloaded and replaced on demand.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ab7d8854

crypto/algapi.c

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <crypto/algapi.h>

#include <crypto/internal/simd.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/fips.h>
@@ -21,6 +22,11 @@ 


static LIST_HEAD(crypto_template_list);



#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS

DEFINE_PER_CPU(bool, crypto_simd_disabled_for_test);

EXPORT_PER_CPU_SYMBOL_GPL(crypto_simd_disabled_for_test);

#endif



static inline void crypto_check_module_sig(struct module *mod)

{

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

crypto/testmgr.c

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests"); 
static unsigned int fuzz_iterations = 100;

module_param(fuzz_iterations, uint, 0644);

MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations");



DEFINE_PER_CPU(bool, crypto_simd_disabled_for_test);

EXPORT_PER_CPU_SYMBOL_GPL(crypto_simd_disabled_for_test);

#endif



#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS