]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/3.10.67/crypto-prefix-module-autoloading-with-crypto.patch
projects / thirdparty / kernel / stable-queue.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
Linux 4.14.95
[thirdparty/kernel/stable-queue.git] / releases / 3.10.67 / crypto-prefix-module-autoloading-with-crypto.patch
1 From 5d26a105b5a73e5635eae0629b42fa0a90e07b7b Mon Sep 17 00:00:00 2001
2 From: Kees Cook <keescook@chromium.org>
3 Date: Thu, 20 Nov 2014 17:05:53 -0800
4 Subject: crypto: prefix module autoloading with "crypto-"
5
6 From: Kees Cook <keescook@chromium.org>
7
8 commit 5d26a105b5a73e5635eae0629b42fa0a90e07b7b upstream.
9
10 This prefixes all crypto module loading with "crypto-" so we never run
11 the risk of exposing module auto-loading to userspace via a crypto API,
12 as demonstrated by Mathias Krause:
13
14 https://lkml.org/lkml/2013/3/4/70
15
16 Signed-off-by: Kees Cook <keescook@chromium.org>
17 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19
20 ---
21 arch/arm/crypto/aes_glue.c | 4 ++--
22 arch/arm/crypto/sha1_glue.c | 2 +-
23 arch/powerpc/crypto/sha1.c | 2 +-
24 arch/s390/crypto/aes_s390.c | 2 +-
25 arch/s390/crypto/des_s390.c | 4 ++--
26 arch/s390/crypto/ghash_s390.c | 2 +-
27 arch/s390/crypto/sha1_s390.c | 2 +-
28 arch/s390/crypto/sha256_s390.c | 4 ++--
29 arch/s390/crypto/sha512_s390.c | 4 ++--
30 arch/sparc/crypto/aes_glue.c | 2 +-
31 arch/sparc/crypto/camellia_glue.c | 2 +-
32 arch/sparc/crypto/crc32c_glue.c | 2 +-
33 arch/sparc/crypto/des_glue.c | 2 +-
34 arch/sparc/crypto/md5_glue.c | 2 +-
35 arch/sparc/crypto/sha1_glue.c | 2 +-
36 arch/sparc/crypto/sha256_glue.c | 4 ++--
37 arch/sparc/crypto/sha512_glue.c | 4 ++--
38 arch/x86/crypto/aes_glue.c | 4 ++--
39 arch/x86/crypto/aesni-intel_glue.c | 2 +-
40 arch/x86/crypto/blowfish_avx2_glue.c | 4 ++--
41 arch/x86/crypto/blowfish_glue.c | 4 ++--
42 arch/x86/crypto/camellia_aesni_avx2_glue.c | 4 ++--
43 arch/x86/crypto/camellia_aesni_avx_glue.c | 4 ++--
44 arch/x86/crypto/camellia_glue.c | 4 ++--
45 arch/x86/crypto/cast5_avx_glue.c | 2 +-
46 arch/x86/crypto/cast6_avx_glue.c | 2 +-
47 arch/x86/crypto/crc32-pclmul_glue.c | 4 ++--
48 arch/x86/crypto/crc32c-intel_glue.c | 4 ++--
49 arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +-
50 arch/x86/crypto/salsa20_glue.c | 4 ++--
51 arch/x86/crypto/serpent_avx2_glue.c | 4 ++--
52 arch/x86/crypto/serpent_avx_glue.c | 2 +-
53 arch/x86/crypto/serpent_sse2_glue.c | 2 +-
54 arch/x86/crypto/sha1_ssse3_glue.c | 2 +-
55 arch/x86/crypto/sha256_ssse3_glue.c | 2 +-
56 arch/x86/crypto/sha512_ssse3_glue.c | 2 +-
57 arch/x86/crypto/twofish_avx2_glue.c | 4 ++--
58 arch/x86/crypto/twofish_avx_glue.c | 2 +-
59 arch/x86/crypto/twofish_glue.c | 4 ++--
60 arch/x86/crypto/twofish_glue_3way.c | 4 ++--
61 crypto/842.c | 1 +
62 crypto/aes_generic.c | 2 +-
63 crypto/ansi_cprng.c | 2 +-
64 crypto/anubis.c | 1 +
65 crypto/api.c | 4 ++--
66 crypto/arc4.c | 1 +
67 crypto/blowfish_generic.c | 2 +-
68 crypto/camellia_generic.c | 2 +-
69 crypto/cast5_generic.c | 2 +-
70 crypto/cast6_generic.c | 2 +-
71 crypto/ccm.c | 4 ++--
72 crypto/crc32.c | 1 +
73 crypto/crypto_null.c | 6 +++---
74 crypto/ctr.c | 2 +-
75 crypto/deflate.c | 2 +-
76 crypto/des_generic.c | 4 ++--
77 crypto/fcrypt.c | 1 +
78 crypto/gcm.c | 6 +++---
79 crypto/ghash-generic.c | 2 +-
80 crypto/khazad.c | 1 +
81 crypto/krng.c | 2 +-
82 crypto/lzo.c | 1 +
83 crypto/md4.c | 2 +-
84 crypto/md5.c | 1 +
85 crypto/michael_mic.c | 1 +
86 crypto/rmd128.c | 1 +
87 crypto/rmd160.c | 1 +
88 crypto/rmd256.c | 1 +
89 crypto/rmd320.c | 1 +
90 crypto/salsa20_generic.c | 2 +-
91 crypto/seed.c | 1 +
92 crypto/serpent_generic.c | 4 ++--
93 crypto/sha1_generic.c | 2 +-
94 crypto/sha256_generic.c | 4 ++--
95 crypto/sha512_generic.c | 4 ++--
96 crypto/tea.c | 4 ++--
97 crypto/tgr192.c | 4 ++--
98 crypto/twofish_generic.c | 2 +-
99 crypto/wp512.c | 4 ++--
100 crypto/zlib.c | 1 +
101 drivers/crypto/padlock-aes.c | 2 +-
102 drivers/crypto/padlock-sha.c | 8 ++++----
103 drivers/crypto/ux500/cryp/cryp_core.c | 4 ++--
104 drivers/crypto/ux500/hash/hash_core.c | 8 ++++----
105 drivers/s390/crypto/ap_bus.c | 1 +
106 include/linux/crypto.h | 13 +++++++++++++
107 86 files changed, 137 insertions(+), 108 deletions(-)
108
109 --- a/arch/arm/crypto/aes_glue.c
110 +++ b/arch/arm/crypto/aes_glue.c
111 @@ -103,6 +103,6 @@ module_exit(aes_fini);
112
113 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");
114 MODULE_LICENSE("GPL");
115 -MODULE_ALIAS("aes");
116 -MODULE_ALIAS("aes-asm");
117 +MODULE_ALIAS_CRYPTO("aes");
118 +MODULE_ALIAS_CRYPTO("aes-asm");
119 MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");
120 --- a/arch/arm/crypto/sha1_glue.c
121 +++ b/arch/arm/crypto/sha1_glue.c
122 @@ -175,5 +175,5 @@ module_exit(sha1_mod_fini);
123
124 MODULE_LICENSE("GPL");
125 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm (ARM)");
126 -MODULE_ALIAS("sha1");
127 +MODULE_ALIAS_CRYPTO("sha1");
128 MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");
129 --- a/arch/powerpc/crypto/sha1.c
130 +++ b/arch/powerpc/crypto/sha1.c
131 @@ -154,4 +154,4 @@ module_exit(sha1_powerpc_mod_fini);
132 MODULE_LICENSE("GPL");
133 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
134
135 -MODULE_ALIAS("sha1-powerpc");
136 +MODULE_ALIAS_CRYPTO("sha1-powerpc");
137 --- a/arch/s390/crypto/aes_s390.c
138 +++ b/arch/s390/crypto/aes_s390.c
139 @@ -970,7 +970,7 @@ static void __exit aes_s390_fini(void)
140 module_init(aes_s390_init);
141 module_exit(aes_s390_fini);
142
143 -MODULE_ALIAS("aes-all");
144 +MODULE_ALIAS_CRYPTO("aes-all");
145
146 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
147 MODULE_LICENSE("GPL");
148 --- a/arch/s390/crypto/des_s390.c
149 +++ b/arch/s390/crypto/des_s390.c
150 @@ -619,8 +619,8 @@ static void __exit des_s390_exit(void)
151 module_init(des_s390_init);
152 module_exit(des_s390_exit);
153
154 -MODULE_ALIAS("des");
155 -MODULE_ALIAS("des3_ede");
156 +MODULE_ALIAS_CRYPTO("des");
157 +MODULE_ALIAS_CRYPTO("des3_ede");
158
159 MODULE_LICENSE("GPL");
160 MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
161 --- a/arch/s390/crypto/ghash_s390.c
162 +++ b/arch/s390/crypto/ghash_s390.c
163 @@ -160,7 +160,7 @@ static void __exit ghash_mod_exit(void)
164 module_init(ghash_mod_init);
165 module_exit(ghash_mod_exit);
166
167 -MODULE_ALIAS("ghash");
168 +MODULE_ALIAS_CRYPTO("ghash");
169
170 MODULE_LICENSE("GPL");
171 MODULE_DESCRIPTION("GHASH Message Digest Algorithm, s390 implementation");
172 --- a/arch/s390/crypto/sha1_s390.c
173 +++ b/arch/s390/crypto/sha1_s390.c
174 @@ -103,6 +103,6 @@ static void __exit sha1_s390_fini(void)
175 module_init(sha1_s390_init);
176 module_exit(sha1_s390_fini);
177
178 -MODULE_ALIAS("sha1");
179 +MODULE_ALIAS_CRYPTO("sha1");
180 MODULE_LICENSE("GPL");
181 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
182 --- a/arch/s390/crypto/sha256_s390.c
183 +++ b/arch/s390/crypto/sha256_s390.c
184 @@ -143,7 +143,7 @@ static void __exit sha256_s390_fini(void
185 module_init(sha256_s390_init);
186 module_exit(sha256_s390_fini);
187
188 -MODULE_ALIAS("sha256");
189 -MODULE_ALIAS("sha224");
190 +MODULE_ALIAS_CRYPTO("sha256");
191 +MODULE_ALIAS_CRYPTO("sha224");
192 MODULE_LICENSE("GPL");
193 MODULE_DESCRIPTION("SHA256 and SHA224 Secure Hash Algorithm");
194 --- a/arch/s390/crypto/sha512_s390.c
195 +++ b/arch/s390/crypto/sha512_s390.c
196 @@ -86,7 +86,7 @@ static struct shash_alg sha512_alg = {
197 }
198 };
199
200 -MODULE_ALIAS("sha512");
201 +MODULE_ALIAS_CRYPTO("sha512");
202
203 static int sha384_init(struct shash_desc *desc)
204 {
205 @@ -126,7 +126,7 @@ static struct shash_alg sha384_alg = {
206 }
207 };
208
209 -MODULE_ALIAS("sha384");
210 +MODULE_ALIAS_CRYPTO("sha384");
211
212 static int __init init(void)
213 {
214 --- a/arch/sparc/crypto/aes_glue.c
215 +++ b/arch/sparc/crypto/aes_glue.c
216 @@ -499,6 +499,6 @@ module_exit(aes_sparc64_mod_fini);
217 MODULE_LICENSE("GPL");
218 MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated");
219
220 -MODULE_ALIAS("aes");
221 +MODULE_ALIAS_CRYPTO("aes");
222
223 #include "crop_devid.c"
224 --- a/arch/sparc/crypto/camellia_glue.c
225 +++ b/arch/sparc/crypto/camellia_glue.c
226 @@ -322,6 +322,6 @@ module_exit(camellia_sparc64_mod_fini);
227 MODULE_LICENSE("GPL");
228 MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated");
229
230 -MODULE_ALIAS("aes");
231 +MODULE_ALIAS_CRYPTO("aes");
232
233 #include "crop_devid.c"
234 --- a/arch/sparc/crypto/crc32c_glue.c
235 +++ b/arch/sparc/crypto/crc32c_glue.c
236 @@ -176,6 +176,6 @@ module_exit(crc32c_sparc64_mod_fini);
237 MODULE_LICENSE("GPL");
238 MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated");
239
240 -MODULE_ALIAS("crc32c");
241 +MODULE_ALIAS_CRYPTO("crc32c");
242
243 #include "crop_devid.c"
244 --- a/arch/sparc/crypto/des_glue.c
245 +++ b/arch/sparc/crypto/des_glue.c
246 @@ -532,6 +532,6 @@ module_exit(des_sparc64_mod_fini);
247 MODULE_LICENSE("GPL");
248 MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated");
249
250 -MODULE_ALIAS("des");
251 +MODULE_ALIAS_CRYPTO("des");
252
253 #include "crop_devid.c"
254 --- a/arch/sparc/crypto/md5_glue.c
255 +++ b/arch/sparc/crypto/md5_glue.c
256 @@ -185,6 +185,6 @@ module_exit(md5_sparc64_mod_fini);
257 MODULE_LICENSE("GPL");
258 MODULE_DESCRIPTION("MD5 Secure Hash Algorithm, sparc64 md5 opcode accelerated");
259
260 -MODULE_ALIAS("md5");
261 +MODULE_ALIAS_CRYPTO("md5");
262
263 #include "crop_devid.c"
264 --- a/arch/sparc/crypto/sha1_glue.c
265 +++ b/arch/sparc/crypto/sha1_glue.c
266 @@ -180,6 +180,6 @@ module_exit(sha1_sparc64_mod_fini);
267 MODULE_LICENSE("GPL");
268 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated");
269
270 -MODULE_ALIAS("sha1");
271 +MODULE_ALIAS_CRYPTO("sha1");
272
273 #include "crop_devid.c"
274 --- a/arch/sparc/crypto/sha256_glue.c
275 +++ b/arch/sparc/crypto/sha256_glue.c
276 @@ -237,7 +237,7 @@ module_exit(sha256_sparc64_mod_fini);
277 MODULE_LICENSE("GPL");
278 MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 opcode accelerated");
279
280 -MODULE_ALIAS("sha224");
281 -MODULE_ALIAS("sha256");
282 +MODULE_ALIAS_CRYPTO("sha224");
283 +MODULE_ALIAS_CRYPTO("sha256");
284
285 #include "crop_devid.c"
286 --- a/arch/sparc/crypto/sha512_glue.c
287 +++ b/arch/sparc/crypto/sha512_glue.c
288 @@ -222,7 +222,7 @@ module_exit(sha512_sparc64_mod_fini);
289 MODULE_LICENSE("GPL");
290 MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 opcode accelerated");
291
292 -MODULE_ALIAS("sha384");
293 -MODULE_ALIAS("sha512");
294 +MODULE_ALIAS_CRYPTO("sha384");
295 +MODULE_ALIAS_CRYPTO("sha512");
296
297 #include "crop_devid.c"
298 --- a/arch/x86/crypto/aes_glue.c
299 +++ b/arch/x86/crypto/aes_glue.c
300 @@ -66,5 +66,5 @@ module_exit(aes_fini);
301
302 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, asm optimized");
303 MODULE_LICENSE("GPL");
304 -MODULE_ALIAS("aes");
305 -MODULE_ALIAS("aes-asm");
306 +MODULE_ALIAS_CRYPTO("aes");
307 +MODULE_ALIAS_CRYPTO("aes-asm");
308 --- a/arch/x86/crypto/aesni-intel_glue.c
309 +++ b/arch/x86/crypto/aesni-intel_glue.c
310 @@ -1373,4 +1373,4 @@ module_exit(aesni_exit);
311
312 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");
313 MODULE_LICENSE("GPL");
314 -MODULE_ALIAS("aes");
315 +MODULE_ALIAS_CRYPTO("aes");
316 --- a/arch/x86/crypto/blowfish_avx2_glue.c
317 +++ b/arch/x86/crypto/blowfish_avx2_glue.c
318 @@ -581,5 +581,5 @@ module_exit(fini);
319
320 MODULE_LICENSE("GPL");
321 MODULE_DESCRIPTION("Blowfish Cipher Algorithm, AVX2 optimized");
322 -MODULE_ALIAS("blowfish");
323 -MODULE_ALIAS("blowfish-asm");
324 +MODULE_ALIAS_CRYPTO("blowfish");
325 +MODULE_ALIAS_CRYPTO("blowfish-asm");
326 --- a/arch/x86/crypto/blowfish_glue.c
327 +++ b/arch/x86/crypto/blowfish_glue.c
328 @@ -465,5 +465,5 @@ module_exit(fini);
329
330 MODULE_LICENSE("GPL");
331 MODULE_DESCRIPTION("Blowfish Cipher Algorithm, asm optimized");
332 -MODULE_ALIAS("blowfish");
333 -MODULE_ALIAS("blowfish-asm");
334 +MODULE_ALIAS_CRYPTO("blowfish");
335 +MODULE_ALIAS_CRYPTO("blowfish-asm");
336 --- a/arch/x86/crypto/camellia_aesni_avx2_glue.c
337 +++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c
338 @@ -582,5 +582,5 @@ module_exit(camellia_aesni_fini);
339
340 MODULE_LICENSE("GPL");
341 MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX2 optimized");
342 -MODULE_ALIAS("camellia");
343 -MODULE_ALIAS("camellia-asm");
344 +MODULE_ALIAS_CRYPTO("camellia");
345 +MODULE_ALIAS_CRYPTO("camellia-asm");
346 --- a/arch/x86/crypto/camellia_aesni_avx_glue.c
347 +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c
348 @@ -574,5 +574,5 @@ module_exit(camellia_aesni_fini);
349
350 MODULE_LICENSE("GPL");
351 MODULE_DESCRIPTION("Camellia Cipher Algorithm, AES-NI/AVX optimized");
352 -MODULE_ALIAS("camellia");
353 -MODULE_ALIAS("camellia-asm");
354 +MODULE_ALIAS_CRYPTO("camellia");
355 +MODULE_ALIAS_CRYPTO("camellia-asm");
356 --- a/arch/x86/crypto/camellia_glue.c
357 +++ b/arch/x86/crypto/camellia_glue.c
358 @@ -1725,5 +1725,5 @@ module_exit(fini);
359
360 MODULE_LICENSE("GPL");
361 MODULE_DESCRIPTION("Camellia Cipher Algorithm, asm optimized");
362 -MODULE_ALIAS("camellia");
363 -MODULE_ALIAS("camellia-asm");
364 +MODULE_ALIAS_CRYPTO("camellia");
365 +MODULE_ALIAS_CRYPTO("camellia-asm");
366 --- a/arch/x86/crypto/cast5_avx_glue.c
367 +++ b/arch/x86/crypto/cast5_avx_glue.c
368 @@ -494,4 +494,4 @@ module_exit(cast5_exit);
369
370 MODULE_DESCRIPTION("Cast5 Cipher Algorithm, AVX optimized");
371 MODULE_LICENSE("GPL");
372 -MODULE_ALIAS("cast5");
373 +MODULE_ALIAS_CRYPTO("cast5");
374 --- a/arch/x86/crypto/cast6_avx_glue.c
375 +++ b/arch/x86/crypto/cast6_avx_glue.c
376 @@ -611,4 +611,4 @@ module_exit(cast6_exit);
377
378 MODULE_DESCRIPTION("Cast6 Cipher Algorithm, AVX optimized");
379 MODULE_LICENSE("GPL");
380 -MODULE_ALIAS("cast6");
381 +MODULE_ALIAS_CRYPTO("cast6");
382 --- a/arch/x86/crypto/crc32-pclmul_glue.c
383 +++ b/arch/x86/crypto/crc32-pclmul_glue.c
384 @@ -197,5 +197,5 @@ module_exit(crc32_pclmul_mod_fini);
385 MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>");
386 MODULE_LICENSE("GPL");
387
388 -MODULE_ALIAS("crc32");
389 -MODULE_ALIAS("crc32-pclmul");
390 +MODULE_ALIAS_CRYPTO("crc32");
391 +MODULE_ALIAS_CRYPTO("crc32-pclmul");
392 --- a/arch/x86/crypto/crc32c-intel_glue.c
393 +++ b/arch/x86/crypto/crc32c-intel_glue.c
394 @@ -280,5 +280,5 @@ MODULE_AUTHOR("Austin Zhang <austin.zhan
395 MODULE_DESCRIPTION("CRC32c (Castagnoli) optimization using Intel Hardware.");
396 MODULE_LICENSE("GPL");
397
398 -MODULE_ALIAS("crc32c");
399 -MODULE_ALIAS("crc32c-intel");
400 +MODULE_ALIAS_CRYPTO("crc32c");
401 +MODULE_ALIAS_CRYPTO("crc32c-intel");
402 --- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
403 +++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
404 @@ -341,4 +341,4 @@ module_exit(ghash_pclmulqdqni_mod_exit);
405 MODULE_LICENSE("GPL");
406 MODULE_DESCRIPTION("GHASH Message Digest Algorithm, "
407 "acclerated by PCLMULQDQ-NI");
408 -MODULE_ALIAS("ghash");
409 +MODULE_ALIAS_CRYPTO("ghash");
410 --- a/arch/x86/crypto/salsa20_glue.c
411 +++ b/arch/x86/crypto/salsa20_glue.c
412 @@ -119,5 +119,5 @@ module_exit(fini);
413
414 MODULE_LICENSE("GPL");
415 MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm (optimized assembly version)");
416 -MODULE_ALIAS("salsa20");
417 -MODULE_ALIAS("salsa20-asm");
418 +MODULE_ALIAS_CRYPTO("salsa20");
419 +MODULE_ALIAS_CRYPTO("salsa20-asm");
420 --- a/arch/x86/crypto/serpent_avx2_glue.c
421 +++ b/arch/x86/crypto/serpent_avx2_glue.c
422 @@ -558,5 +558,5 @@ module_exit(fini);
423
424 MODULE_LICENSE("GPL");
425 MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX2 optimized");
426 -MODULE_ALIAS("serpent");
427 -MODULE_ALIAS("serpent-asm");
428 +MODULE_ALIAS_CRYPTO("serpent");
429 +MODULE_ALIAS_CRYPTO("serpent-asm");
430 --- a/arch/x86/crypto/serpent_avx_glue.c
431 +++ b/arch/x86/crypto/serpent_avx_glue.c
432 @@ -617,4 +617,4 @@ module_exit(serpent_exit);
433
434 MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX optimized");
435 MODULE_LICENSE("GPL");
436 -MODULE_ALIAS("serpent");
437 +MODULE_ALIAS_CRYPTO("serpent");
438 --- a/arch/x86/crypto/serpent_sse2_glue.c
439 +++ b/arch/x86/crypto/serpent_sse2_glue.c
440 @@ -618,4 +618,4 @@ module_exit(serpent_sse2_exit);
441
442 MODULE_DESCRIPTION("Serpent Cipher Algorithm, SSE2 optimized");
443 MODULE_LICENSE("GPL");
444 -MODULE_ALIAS("serpent");
445 +MODULE_ALIAS_CRYPTO("serpent");
446 --- a/arch/x86/crypto/sha1_ssse3_glue.c
447 +++ b/arch/x86/crypto/sha1_ssse3_glue.c
448 @@ -237,4 +237,4 @@ module_exit(sha1_ssse3_mod_fini);
449 MODULE_LICENSE("GPL");
450 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, Supplemental SSE3 accelerated");
451
452 -MODULE_ALIAS("sha1");
453 +MODULE_ALIAS_CRYPTO("sha1");
454 --- a/arch/x86/crypto/sha256_ssse3_glue.c
455 +++ b/arch/x86/crypto/sha256_ssse3_glue.c
456 @@ -272,4 +272,4 @@ module_exit(sha256_ssse3_mod_fini);
457 MODULE_LICENSE("GPL");
458 MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm, Supplemental SSE3 accelerated");
459
460 -MODULE_ALIAS("sha256");
461 +MODULE_ALIAS_CRYPTO("sha256");
462 --- a/arch/x86/crypto/sha512_ssse3_glue.c
463 +++ b/arch/x86/crypto/sha512_ssse3_glue.c
464 @@ -279,4 +279,4 @@ module_exit(sha512_ssse3_mod_fini);
465 MODULE_LICENSE("GPL");
466 MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, Supplemental SSE3 accelerated");
467
468 -MODULE_ALIAS("sha512");
469 +MODULE_ALIAS_CRYPTO("sha512");
470 --- a/arch/x86/crypto/twofish_avx2_glue.c
471 +++ b/arch/x86/crypto/twofish_avx2_glue.c
472 @@ -580,5 +580,5 @@ module_exit(fini);
473
474 MODULE_LICENSE("GPL");
475 MODULE_DESCRIPTION("Twofish Cipher Algorithm, AVX2 optimized");
476 -MODULE_ALIAS("twofish");
477 -MODULE_ALIAS("twofish-asm");
478 +MODULE_ALIAS_CRYPTO("twofish");
479 +MODULE_ALIAS_CRYPTO("twofish-asm");
480 --- a/arch/x86/crypto/twofish_avx_glue.c
481 +++ b/arch/x86/crypto/twofish_avx_glue.c
482 @@ -589,4 +589,4 @@ module_exit(twofish_exit);
483
484 MODULE_DESCRIPTION("Twofish Cipher Algorithm, AVX optimized");
485 MODULE_LICENSE("GPL");
486 -MODULE_ALIAS("twofish");
487 +MODULE_ALIAS_CRYPTO("twofish");
488 --- a/arch/x86/crypto/twofish_glue.c
489 +++ b/arch/x86/crypto/twofish_glue.c
490 @@ -96,5 +96,5 @@ module_exit(fini);
491
492 MODULE_LICENSE("GPL");
493 MODULE_DESCRIPTION ("Twofish Cipher Algorithm, asm optimized");
494 -MODULE_ALIAS("twofish");
495 -MODULE_ALIAS("twofish-asm");
496 +MODULE_ALIAS_CRYPTO("twofish");
497 +MODULE_ALIAS_CRYPTO("twofish-asm");
498 --- a/arch/x86/crypto/twofish_glue_3way.c
499 +++ b/arch/x86/crypto/twofish_glue_3way.c
500 @@ -495,5 +495,5 @@ module_exit(fini);
501
502 MODULE_LICENSE("GPL");
503 MODULE_DESCRIPTION("Twofish Cipher Algorithm, 3-way parallel asm optimized");
504 -MODULE_ALIAS("twofish");
505 -MODULE_ALIAS("twofish-asm");
506 +MODULE_ALIAS_CRYPTO("twofish");
507 +MODULE_ALIAS_CRYPTO("twofish-asm");
508 --- a/crypto/842.c
509 +++ b/crypto/842.c
510 @@ -180,3 +180,4 @@ module_exit(nx842_mod_exit);
511
512 MODULE_LICENSE("GPL");
513 MODULE_DESCRIPTION("842 Compression Algorithm");
514 +MODULE_ALIAS_CRYPTO("842");
515 --- a/crypto/aes_generic.c
516 +++ b/crypto/aes_generic.c
517 @@ -1474,4 +1474,4 @@ module_exit(aes_fini);
518
519 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");
520 MODULE_LICENSE("Dual BSD/GPL");
521 -MODULE_ALIAS("aes");
522 +MODULE_ALIAS_CRYPTO("aes");
523 --- a/crypto/ansi_cprng.c
524 +++ b/crypto/ansi_cprng.c
525 @@ -476,4 +476,4 @@ module_param(dbg, int, 0);
526 MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)");
527 module_init(prng_mod_init);
528 module_exit(prng_mod_fini);
529 -MODULE_ALIAS("stdrng");
530 +MODULE_ALIAS_CRYPTO("stdrng");
531 --- a/crypto/anubis.c
532 +++ b/crypto/anubis.c
533 @@ -704,3 +704,4 @@ module_exit(anubis_mod_fini);
534
535 MODULE_LICENSE("GPL");
536 MODULE_DESCRIPTION("Anubis Cryptographic Algorithm");
537 +MODULE_ALIAS_CRYPTO("anubis");
538 --- a/crypto/api.c
539 +++ b/crypto/api.c
540 @@ -216,11 +216,11 @@ struct crypto_alg *crypto_larval_lookup(
541
542 alg = crypto_alg_lookup(name, type, mask);
543 if (!alg) {
544 - request_module("%s", name);
545 + request_module("crypto-%s", name);
546
547 if (!((type ^ CRYPTO_ALG_NEED_FALLBACK) & mask &
548 CRYPTO_ALG_NEED_FALLBACK))
549 - request_module("%s-all", name);
550 + request_module("crypto-%s-all", name);
551
552 alg = crypto_alg_lookup(name, type, mask);
553 }
554 --- a/crypto/arc4.c
555 +++ b/crypto/arc4.c
556 @@ -166,3 +166,4 @@ module_exit(arc4_exit);
557 MODULE_LICENSE("GPL");
558 MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
559 MODULE_AUTHOR("Jon Oberheide <jon@oberheide.org>");
560 +MODULE_ALIAS_CRYPTO("arc4");
561 --- a/crypto/blowfish_generic.c
562 +++ b/crypto/blowfish_generic.c
563 @@ -138,4 +138,4 @@ module_exit(blowfish_mod_fini);
564
565 MODULE_LICENSE("GPL");
566 MODULE_DESCRIPTION("Blowfish Cipher Algorithm");
567 -MODULE_ALIAS("blowfish");
568 +MODULE_ALIAS_CRYPTO("blowfish");
569 --- a/crypto/camellia_generic.c
570 +++ b/crypto/camellia_generic.c
571 @@ -1098,4 +1098,4 @@ module_exit(camellia_fini);
572
573 MODULE_DESCRIPTION("Camellia Cipher Algorithm");
574 MODULE_LICENSE("GPL");
575 -MODULE_ALIAS("camellia");
576 +MODULE_ALIAS_CRYPTO("camellia");
577 --- a/crypto/cast5_generic.c
578 +++ b/crypto/cast5_generic.c
579 @@ -549,4 +549,4 @@ module_exit(cast5_mod_fini);
580
581 MODULE_LICENSE("GPL");
582 MODULE_DESCRIPTION("Cast5 Cipher Algorithm");
583 -MODULE_ALIAS("cast5");
584 +MODULE_ALIAS_CRYPTO("cast5");
585 --- a/crypto/cast6_generic.c
586 +++ b/crypto/cast6_generic.c
587 @@ -291,4 +291,4 @@ module_exit(cast6_mod_fini);
588
589 MODULE_LICENSE("GPL");
590 MODULE_DESCRIPTION("Cast6 Cipher Algorithm");
591 -MODULE_ALIAS("cast6");
592 +MODULE_ALIAS_CRYPTO("cast6");
593 --- a/crypto/ccm.c
594 +++ b/crypto/ccm.c
595 @@ -879,5 +879,5 @@ module_exit(crypto_ccm_module_exit);
596
597 MODULE_LICENSE("GPL");
598 MODULE_DESCRIPTION("Counter with CBC MAC");
599 -MODULE_ALIAS("ccm_base");
600 -MODULE_ALIAS("rfc4309");
601 +MODULE_ALIAS_CRYPTO("ccm_base");
602 +MODULE_ALIAS_CRYPTO("rfc4309");
603 --- a/crypto/crc32.c
604 +++ b/crypto/crc32.c
605 @@ -156,3 +156,4 @@ module_exit(crc32_mod_fini);
606 MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>");
607 MODULE_DESCRIPTION("CRC32 calculations wrapper for lib/crc32");
608 MODULE_LICENSE("GPL");
609 +MODULE_ALIAS_CRYPTO("crc32");
610 --- a/crypto/crypto_null.c
611 +++ b/crypto/crypto_null.c
612 @@ -149,9 +149,9 @@ static struct crypto_alg null_algs[3] =
613 .coa_decompress = null_compress } }
614 } };
615
616 -MODULE_ALIAS("compress_null");
617 -MODULE_ALIAS("digest_null");
618 -MODULE_ALIAS("cipher_null");
619 +MODULE_ALIAS_CRYPTO("compress_null");
620 +MODULE_ALIAS_CRYPTO("digest_null");
621 +MODULE_ALIAS_CRYPTO("cipher_null");
622
623 static int __init crypto_null_mod_init(void)
624 {
625 --- a/crypto/ctr.c
626 +++ b/crypto/ctr.c
627 @@ -466,4 +466,4 @@ module_exit(crypto_ctr_module_exit);
628
629 MODULE_LICENSE("GPL");
630 MODULE_DESCRIPTION("CTR Counter block mode");
631 -MODULE_ALIAS("rfc3686");
632 +MODULE_ALIAS_CRYPTO("rfc3686");
633 --- a/crypto/deflate.c
634 +++ b/crypto/deflate.c
635 @@ -222,4 +222,4 @@ module_exit(deflate_mod_fini);
636 MODULE_LICENSE("GPL");
637 MODULE_DESCRIPTION("Deflate Compression Algorithm for IPCOMP");
638 MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
639 -
640 +MODULE_ALIAS_CRYPTO("deflate");
641 --- a/crypto/des_generic.c
642 +++ b/crypto/des_generic.c
643 @@ -971,7 +971,7 @@ static struct crypto_alg des_algs[2] = {
644 .cia_decrypt = des3_ede_decrypt } }
645 } };
646
647 -MODULE_ALIAS("des3_ede");
648 +MODULE_ALIAS_CRYPTO("des3_ede");
649
650 static int __init des_generic_mod_init(void)
651 {
652 @@ -989,4 +989,4 @@ module_exit(des_generic_mod_fini);
653 MODULE_LICENSE("GPL");
654 MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms");
655 MODULE_AUTHOR("Dag Arne Osvik <da@osvik.no>");
656 -MODULE_ALIAS("des");
657 +MODULE_ALIAS_CRYPTO("des");
658 --- a/crypto/fcrypt.c
659 +++ b/crypto/fcrypt.c
660 @@ -420,3 +420,4 @@ module_exit(fcrypt_mod_fini);
661 MODULE_LICENSE("Dual BSD/GPL");
662 MODULE_DESCRIPTION("FCrypt Cipher Algorithm");
663 MODULE_AUTHOR("David Howells <dhowells@redhat.com>");
664 +MODULE_ALIAS_CRYPTO("fcrypt");
665 --- a/crypto/gcm.c
666 +++ b/crypto/gcm.c
667 @@ -1441,6 +1441,6 @@ module_exit(crypto_gcm_module_exit);
668 MODULE_LICENSE("GPL");
669 MODULE_DESCRIPTION("Galois/Counter Mode");
670 MODULE_AUTHOR("Mikko Herranen <mh1@iki.fi>");
671 -MODULE_ALIAS("gcm_base");
672 -MODULE_ALIAS("rfc4106");
673 -MODULE_ALIAS("rfc4543");
674 +MODULE_ALIAS_CRYPTO("gcm_base");
675 +MODULE_ALIAS_CRYPTO("rfc4106");
676 +MODULE_ALIAS_CRYPTO("rfc4543");
677 --- a/crypto/ghash-generic.c
678 +++ b/crypto/ghash-generic.c
679 @@ -172,4 +172,4 @@ module_exit(ghash_mod_exit);
680
681 MODULE_LICENSE("GPL");
682 MODULE_DESCRIPTION("GHASH Message Digest Algorithm");
683 -MODULE_ALIAS("ghash");
684 +MODULE_ALIAS_CRYPTO("ghash");
685 --- a/crypto/khazad.c
686 +++ b/crypto/khazad.c
687 @@ -880,3 +880,4 @@ module_exit(khazad_mod_fini);
688
689 MODULE_LICENSE("GPL");
690 MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");
691 +MODULE_ALIAS_CRYPTO("khazad");
692 --- a/crypto/krng.c
693 +++ b/crypto/krng.c
694 @@ -62,4 +62,4 @@ module_exit(krng_mod_fini);
695
696 MODULE_LICENSE("GPL");
697 MODULE_DESCRIPTION("Kernel Random Number Generator");
698 -MODULE_ALIAS("stdrng");
699 +MODULE_ALIAS_CRYPTO("stdrng");
700 --- a/crypto/lzo.c
701 +++ b/crypto/lzo.c
702 @@ -103,3 +103,4 @@ module_exit(lzo_mod_fini);
703
704 MODULE_LICENSE("GPL");
705 MODULE_DESCRIPTION("LZO Compression Algorithm");
706 +MODULE_ALIAS_CRYPTO("lzo");
707 --- a/crypto/md4.c
708 +++ b/crypto/md4.c
709 @@ -255,4 +255,4 @@ module_exit(md4_mod_fini);
710
711 MODULE_LICENSE("GPL");
712 MODULE_DESCRIPTION("MD4 Message Digest Algorithm");
713 -
714 +MODULE_ALIAS_CRYPTO("md4");
715 --- a/crypto/md5.c
716 +++ b/crypto/md5.c
717 @@ -168,3 +168,4 @@ module_exit(md5_mod_fini);
718
719 MODULE_LICENSE("GPL");
720 MODULE_DESCRIPTION("MD5 Message Digest Algorithm");
721 +MODULE_ALIAS_CRYPTO("md5");
722 --- a/crypto/michael_mic.c
723 +++ b/crypto/michael_mic.c
724 @@ -184,3 +184,4 @@ module_exit(michael_mic_exit);
725 MODULE_LICENSE("GPL v2");
726 MODULE_DESCRIPTION("Michael MIC");
727 MODULE_AUTHOR("Jouni Malinen <j@w1.fi>");
728 +MODULE_ALIAS_CRYPTO("michael_mic");
729 --- a/crypto/rmd128.c
730 +++ b/crypto/rmd128.c
731 @@ -327,3 +327,4 @@ module_exit(rmd128_mod_fini);
732 MODULE_LICENSE("GPL");
733 MODULE_AUTHOR("Adrian-Ken Rueegsegger <ken@codelabs.ch>");
734 MODULE_DESCRIPTION("RIPEMD-128 Message Digest");
735 +MODULE_ALIAS_CRYPTO("rmd128");
736 --- a/crypto/rmd160.c
737 +++ b/crypto/rmd160.c
738 @@ -371,3 +371,4 @@ module_exit(rmd160_mod_fini);
739 MODULE_LICENSE("GPL");
740 MODULE_AUTHOR("Adrian-Ken Rueegsegger <ken@codelabs.ch>");
741 MODULE_DESCRIPTION("RIPEMD-160 Message Digest");
742 +MODULE_ALIAS_CRYPTO("rmd160");
743 --- a/crypto/rmd256.c
744 +++ b/crypto/rmd256.c
745 @@ -346,3 +346,4 @@ module_exit(rmd256_mod_fini);
746 MODULE_LICENSE("GPL");
747 MODULE_AUTHOR("Adrian-Ken Rueegsegger <ken@codelabs.ch>");
748 MODULE_DESCRIPTION("RIPEMD-256 Message Digest");
749 +MODULE_ALIAS_CRYPTO("rmd256");
750 --- a/crypto/rmd320.c
751 +++ b/crypto/rmd320.c
752 @@ -395,3 +395,4 @@ module_exit(rmd320_mod_fini);
753 MODULE_LICENSE("GPL");
754 MODULE_AUTHOR("Adrian-Ken Rueegsegger <ken@codelabs.ch>");
755 MODULE_DESCRIPTION("RIPEMD-320 Message Digest");
756 +MODULE_ALIAS_CRYPTO("rmd320");
757 --- a/crypto/salsa20_generic.c
758 +++ b/crypto/salsa20_generic.c
759 @@ -248,4 +248,4 @@ module_exit(salsa20_generic_mod_fini);
760
761 MODULE_LICENSE("GPL");
762 MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm");
763 -MODULE_ALIAS("salsa20");
764 +MODULE_ALIAS_CRYPTO("salsa20");
765 --- a/crypto/seed.c
766 +++ b/crypto/seed.c
767 @@ -476,3 +476,4 @@ module_exit(seed_fini);
768 MODULE_DESCRIPTION("SEED Cipher Algorithm");
769 MODULE_LICENSE("GPL");
770 MODULE_AUTHOR("Hye-Shik Chang <perky@FreeBSD.org>, Kim Hyun <hkim@kisa.or.kr>");
771 +MODULE_ALIAS_CRYPTO("seed");
772 --- a/crypto/serpent_generic.c
773 +++ b/crypto/serpent_generic.c
774 @@ -665,5 +665,5 @@ module_exit(serpent_mod_fini);
775 MODULE_LICENSE("GPL");
776 MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm");
777 MODULE_AUTHOR("Dag Arne Osvik <osvik@ii.uib.no>");
778 -MODULE_ALIAS("tnepres");
779 -MODULE_ALIAS("serpent");
780 +MODULE_ALIAS_CRYPTO("tnepres");
781 +MODULE_ALIAS_CRYPTO("serpent");
782 --- a/crypto/sha1_generic.c
783 +++ b/crypto/sha1_generic.c
784 @@ -153,4 +153,4 @@ module_exit(sha1_generic_mod_fini);
785 MODULE_LICENSE("GPL");
786 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
787
788 -MODULE_ALIAS("sha1");
789 +MODULE_ALIAS_CRYPTO("sha1");
790 --- a/crypto/sha256_generic.c
791 +++ b/crypto/sha256_generic.c
792 @@ -384,5 +384,5 @@ module_exit(sha256_generic_mod_fini);
793 MODULE_LICENSE("GPL");
794 MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm");
795
796 -MODULE_ALIAS("sha224");
797 -MODULE_ALIAS("sha256");
798 +MODULE_ALIAS_CRYPTO("sha224");
799 +MODULE_ALIAS_CRYPTO("sha256");
800 --- a/crypto/sha512_generic.c
801 +++ b/crypto/sha512_generic.c
802 @@ -285,5 +285,5 @@ module_exit(sha512_generic_mod_fini);
803 MODULE_LICENSE("GPL");
804 MODULE_DESCRIPTION("SHA-512 and SHA-384 Secure Hash Algorithms");
805
806 -MODULE_ALIAS("sha384");
807 -MODULE_ALIAS("sha512");
808 +MODULE_ALIAS_CRYPTO("sha384");
809 +MODULE_ALIAS_CRYPTO("sha512");
810 --- a/crypto/tea.c
811 +++ b/crypto/tea.c
812 @@ -270,8 +270,8 @@ static void __exit tea_mod_fini(void)
813 crypto_unregister_algs(tea_algs, ARRAY_SIZE(tea_algs));
814 }
815
816 -MODULE_ALIAS("xtea");
817 -MODULE_ALIAS("xeta");
818 +MODULE_ALIAS_CRYPTO("xtea");
819 +MODULE_ALIAS_CRYPTO("xeta");
820
821 module_init(tea_mod_init);
822 module_exit(tea_mod_fini);
823 --- a/crypto/tgr192.c
824 +++ b/crypto/tgr192.c
825 @@ -676,8 +676,8 @@ static void __exit tgr192_mod_fini(void)
826 crypto_unregister_shashes(tgr_algs, ARRAY_SIZE(tgr_algs));
827 }
828
829 -MODULE_ALIAS("tgr160");
830 -MODULE_ALIAS("tgr128");
831 +MODULE_ALIAS_CRYPTO("tgr160");
832 +MODULE_ALIAS_CRYPTO("tgr128");
833
834 module_init(tgr192_mod_init);
835 module_exit(tgr192_mod_fini);
836 --- a/crypto/twofish_generic.c
837 +++ b/crypto/twofish_generic.c
838 @@ -211,4 +211,4 @@ module_exit(twofish_mod_fini);
839
840 MODULE_LICENSE("GPL");
841 MODULE_DESCRIPTION ("Twofish Cipher Algorithm");
842 -MODULE_ALIAS("twofish");
843 +MODULE_ALIAS_CRYPTO("twofish");
844 --- a/crypto/wp512.c
845 +++ b/crypto/wp512.c
846 @@ -1167,8 +1167,8 @@ static void __exit wp512_mod_fini(void)
847 crypto_unregister_shashes(wp_algs, ARRAY_SIZE(wp_algs));
848 }
849
850 -MODULE_ALIAS("wp384");
851 -MODULE_ALIAS("wp256");
852 +MODULE_ALIAS_CRYPTO("wp384");
853 +MODULE_ALIAS_CRYPTO("wp256");
854
855 module_init(wp512_mod_init);
856 module_exit(wp512_mod_fini);
857 --- a/crypto/zlib.c
858 +++ b/crypto/zlib.c
859 @@ -378,3 +378,4 @@ module_exit(zlib_mod_fini);
860 MODULE_LICENSE("GPL");
861 MODULE_DESCRIPTION("Zlib Compression Algorithm");
862 MODULE_AUTHOR("Sony Corporation");
863 +MODULE_ALIAS_CRYPTO("zlib");
864 --- a/drivers/crypto/padlock-aes.c
865 +++ b/drivers/crypto/padlock-aes.c
866 @@ -563,4 +563,4 @@ MODULE_DESCRIPTION("VIA PadLock AES algo
867 MODULE_LICENSE("GPL");
868 MODULE_AUTHOR("Michal Ludvig");
869
870 -MODULE_ALIAS("aes");
871 +MODULE_ALIAS_CRYPTO("aes");
872 --- a/drivers/crypto/padlock-sha.c
873 +++ b/drivers/crypto/padlock-sha.c
874 @@ -593,7 +593,7 @@ MODULE_DESCRIPTION("VIA PadLock SHA1/SHA
875 MODULE_LICENSE("GPL");
876 MODULE_AUTHOR("Michal Ludvig");
877
878 -MODULE_ALIAS("sha1-all");
879 -MODULE_ALIAS("sha256-all");
880 -MODULE_ALIAS("sha1-padlock");
881 -MODULE_ALIAS("sha256-padlock");
882 +MODULE_ALIAS_CRYPTO("sha1-all");
883 +MODULE_ALIAS_CRYPTO("sha256-all");
884 +MODULE_ALIAS_CRYPTO("sha1-padlock");
885 +MODULE_ALIAS_CRYPTO("sha256-padlock");
886 --- a/drivers/crypto/ux500/cryp/cryp_core.c
887 +++ b/drivers/crypto/ux500/cryp/cryp_core.c
888 @@ -1775,7 +1775,7 @@ module_exit(ux500_cryp_mod_fini);
889 module_param(cryp_mode, int, 0);
890
891 MODULE_DESCRIPTION("Driver for ST-Ericsson UX500 CRYP crypto engine.");
892 -MODULE_ALIAS("aes-all");
893 -MODULE_ALIAS("des-all");
894 +MODULE_ALIAS_CRYPTO("aes-all");
895 +MODULE_ALIAS_CRYPTO("des-all");
896
897 MODULE_LICENSE("GPL");
898 --- a/drivers/crypto/ux500/hash/hash_core.c
899 +++ b/drivers/crypto/ux500/hash/hash_core.c
900 @@ -1998,7 +1998,7 @@ module_exit(ux500_hash_mod_fini);
901 MODULE_DESCRIPTION("Driver for ST-Ericsson UX500 HASH engine.");
902 MODULE_LICENSE("GPL");
903
904 -MODULE_ALIAS("sha1-all");
905 -MODULE_ALIAS("sha256-all");
906 -MODULE_ALIAS("hmac-sha1-all");
907 -MODULE_ALIAS("hmac-sha256-all");
908 +MODULE_ALIAS_CRYPTO("sha1-all");
909 +MODULE_ALIAS_CRYPTO("sha256-all");
910 +MODULE_ALIAS_CRYPTO("hmac-sha1-all");
911 +MODULE_ALIAS_CRYPTO("hmac-sha256-all");
912 --- a/drivers/s390/crypto/ap_bus.c
913 +++ b/drivers/s390/crypto/ap_bus.c
914 @@ -44,6 +44,7 @@
915 #include <linux/hrtimer.h>
916 #include <linux/ktime.h>
917 #include <asm/facility.h>
918 +#include <linux/crypto.h>
919
920 #include "ap_bus.h"
921
922 --- a/include/linux/crypto.h
923 +++ b/include/linux/crypto.h
924 @@ -26,6 +26,19 @@
925 #include <linux/uaccess.h>
926
927 /*
928 + * Autoloaded crypto modules should only use a prefixed name to avoid allowing
929 + * arbitrary modules to be loaded. Loading from userspace may still need the
930 + * unprefixed names, so retains those aliases as well.
931 + * This uses __MODULE_INFO directly instead of MODULE_ALIAS because pre-4.3
932 + * gcc (e.g. avr32 toolchain) uses __LINE__ for uniqueness, and this macro
933 + * expands twice on the same line. Instead, use a separate base name for the
934 + * alias.
935 + */
936 +#define MODULE_ALIAS_CRYPTO(name) \
937 + __MODULE_INFO(alias, alias_userspace, name); \
938 + __MODULE_INFO(alias, alias_crypto, "crypto-" name)
939 +
940 +/*
941 * Algorithm masks and types.
942 */
943 #define CRYPTO_ALG_TYPE_MASK 0x0000000f
Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git