crypto: arm/nhpoly1305 - eliminate unnecessary CFI wrapper

The arm architecture doesn't support CFI yet, and even if it did, the
new CFI implementation supports indirect calls to assembly functions.
Therefore, there's no need to use a wrapper function for nh_neon().

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/nh-neon-core.S b/arch/arm/crypto/nh-neon-core.S
index 434d80ab531c2a600fbcffc89c21e6a8ad5ef284..01620a0782ca93f2aa34730b526fe25f1c273e83 100644 (file)
--- a/arch/arm/crypto/nh-neon-core.S
+++ b/arch/arm/crypto/nh-neon-core.S
@@ -69,7 +69,7 @@
 
 /*
  * void nh_neon(const u32 *key, const u8 *message, size_t message_len,
- *             u8 hash[NH_HASH_BYTES])
+ *             __le64 hash[NH_NUM_PASSES])
  *
  * It's guaranteed that message_len % 16 == 0.
  */

diff --git a/arch/arm/crypto/nhpoly1305-neon-glue.c b/arch/arm/crypto/nhpoly1305-neon-glue.c
index ffa8d73fe722c231720e86d3d6aeb91ab283754b..e93e41ff265665a094efd8cc2c791bef5479e7dd 100644 (file)
--- a/arch/arm/crypto/nhpoly1305-neon-glue.c
+++ b/arch/arm/crypto/nhpoly1305-neon-glue.c
@@ -14,14 +14,7 @@
 #include <linux/module.h>
 
 asmlinkage void nh_neon(const u32 *key, const u8 *message, size_t message_len,
-                       u8 hash[NH_HASH_BYTES]);
-
-/* wrapper to avoid indirect call to assembly, which doesn't work with CFI */
-static void _nh_neon(const u32 *key, const u8 *message, size_t message_len,
-                    __le64 hash[NH_NUM_PASSES])
-{
-       nh_neon(key, message, message_len, (u8 *)hash);
-}
+                       __le64 hash[NH_NUM_PASSES]);
 
 static int nhpoly1305_neon_update(struct shash_desc *desc,
                                  const u8 *src, unsigned int srclen)
@@ -33,7 +26,7 @@ static int nhpoly1305_neon_update(struct shash_desc *desc,
                unsigned int n = min_t(unsigned int, srclen, SZ_4K);
 
                kernel_neon_begin();
-               crypto_nhpoly1305_update_helper(desc, src, n, _nh_neon);
+               crypto_nhpoly1305_update_helper(desc, src, n, nh_neon);
                kernel_neon_end();
                src += n;
                srclen -= n;