crypto: aesni - Fix failure when pcbc module is absent

When aesni is built as a module together with pcbc, the pcbc module
must be present for aesni to load.  However, the pcbc module may not
be present for reasons such as its absence on initramfs.  This patch
allows the aesni to function even if the pcbc module is enabled but
not present.

Reported-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 6ef688a1ef3e..7ff1b0c86a8e 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1085,9 +1085,9 @@ static void aesni_free_simds(void)
                     aesni_simd_skciphers[i]; i++)
                 simd_skcipher_free(aesni_simd_skciphers[i]);
 
-        for (i = 0; i < ARRAY_SIZE(aesni_simd_skciphers2) &&
-                    aesni_simd_skciphers2[i].simd; i++)
-                simd_skcipher_free(aesni_simd_skciphers2[i].simd);
+        for (i = 0; i < ARRAY_SIZE(aesni_simd_skciphers2); i++)
+                if (aesni_simd_skciphers2[i].simd)
+                        simd_skcipher_free(aesni_simd_skciphers2[i].simd);
 }
 
 static int __init aesni_init(void)
@@ -1168,7 +1168,7 @@ static int __init aesni_init(void)
                 simd = simd_skcipher_create_compat(algname, drvname, basename);
                 err = PTR_ERR(simd);
                 if (IS_ERR(simd))
-                        goto unregister_simds;
+                        continue;
 
                 aesni_simd_skciphers2[i].simd = simd;
         }