summaryrefslogtreecommitdiff
path: root/crypto/sm4_generic.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-04-12 07:57:42 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2019-04-18 17:15:03 +0300
commitc4741b23059794bd99beef0f700103b0d983b3fd (patch)
tree8db3440418a9c3ed32d57c2c2a35340479d3cc44 /crypto/sm4_generic.c
parent40153b10d91c9e25f912344ba6ce1f0874400659 (diff)
downloadlinux-c4741b23059794bd99beef0f700103b0d983b3fd.tar.xz
crypto: run initcalls for generic implementations earlier
Use subsys_initcall for registration of all templates and generic algorithm implementations, rather than module_init. Then change cryptomgr to use arch_initcall, to place it before the subsys_initcalls. This is needed so that when both a generic and optimized implementation of an algorithm are built into the kernel (not loadable modules), the generic implementation is registered before the optimized one. Otherwise, the self-tests for the optimized implementation are unable to allocate the generic implementation for the new comparison fuzz tests. Note that on arm, a side effect of this change is that self-tests for generic implementations may run before the unaligned access handler has been installed. So, unaligned accesses will crash the kernel. This is arguably a good thing as it makes it easier to detect that type of bug. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/sm4_generic.c')
-rw-r--r--crypto/sm4_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sm4_generic.c b/crypto/sm4_generic.c
index c18eebfd5edd..71ffb343709a 100644
--- a/crypto/sm4_generic.c
+++ b/crypto/sm4_generic.c
@@ -237,7 +237,7 @@ static void __exit sm4_fini(void)
crypto_unregister_alg(&sm4_alg);
}
-module_init(sm4_init);
+subsys_initcall(sm4_init);
module_exit(sm4_fini);
MODULE_DESCRIPTION("SM4 Cipher Algorithm");