crypto: aesni - fix failing setkey for rfc4106-gcm-aesni

tstruk · herbertx · commit 0fbafd06bdde · 2015-06-29T16:06:30.000+08:00
rfc4106(gcm(aes)) uses ctr(aes) to generate hash key. ctr(aes) needs
chainiv, but the chainiv gets initialized after aesni_intel when both
are statically linked so the setkey fails.
This patch forces aesni_intel to be initialized after chainiv.

Signed-off-by: Tadeusz Struk &lt;tadeusz.struk@intel.com&gt;
Tested-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
@@ -1537,7 +1537,7 @@ static void __exit aesni_exit(void)
 	crypto_fpu_exit();
 }
 
-module_init(aesni_init);
+late_initcall(aesni_init);
 module_exit(aesni_exit);
 
 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");

Original file line number	Diff line number	Diff line change
`@@ -1537,7 +1537,7 @@ static void __exit aesni_exit(void)`
`1537`	`1537`	`crypto_fpu_exit();`
`1538`	`1538`	`}`
`1539`	`1539`
`1540`		`-module_init(aesni_init);`
	`1540`	`+late_initcall(aesni_init);`
`1541`	`1541`	`module_exit(aesni_exit);`
`1542`	`1542`
`1543`	`1543`	`MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");`