summaryrefslogtreecommitdiff
path: root/crypto/camellia_generic.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2014-11-21 04:05:53 +0300
committerLuis Henriques <luis.henriques@canonical.com>2015-02-04 13:57:48 +0300
commit6359ca00be9de08b4495d036ea1f1935dfe65022 (patch)
tree24baebe97d7c40f3f043f2b21c31a84c75742c3b /crypto/camellia_generic.c
parent1d3695b3687222cebf05eeab2c32d1c65ccac765 (diff)
downloadlinux-6359ca00be9de08b4495d036ea1f1935dfe65022.tar.xz
crypto: prefix module autoloading with "crypto-"
commit 5d26a105b5a73e5635eae0629b42fa0a90e07b7b upstream. This prefixes all crypto module loading with "crypto-" so we never run the risk of exposing module auto-loading to userspace via a crypto API, as demonstrated by Mathias Krause: https://lkml.org/lkml/2013/3/4/70 Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> [ luis: backported to 3.16: dropped changes to: - arch/arm/crypto/sha1_neon_glue.c - arch/arm/crypto/sha512_neon_glue.c - arch/x86/crypto/des3_ede_glue.c - drivers/crypto/qat/qat_common/adf_ctl_drv.c ] Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'crypto/camellia_generic.c')
-rw-r--r--crypto/camellia_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c
index 26bcd7a2d6b4..1b74c5a3e891 100644
--- a/crypto/camellia_generic.c
+++ b/crypto/camellia_generic.c
@@ -1098,4 +1098,4 @@ module_exit(camellia_fini);
MODULE_DESCRIPTION("Camellia Cipher Algorithm");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("camellia");
+MODULE_ALIAS_CRYPTO("camellia");