crypto: sha3-generic - fixes for alignment and big endian operation

Ensure that the input is byte swabbed before injecting it into the
SHA3 transform. Use the get_unaligned() accessor for this so that
we don't perform unaligned access inadvertently on architectures
that do not support that.

Cc: <stable@vger.kernel.org>
Fixes: 53964b9ee63b7075 ("crypto: sha3 - Add SHA-3 hash algorithm")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 3 insertions, 2 deletions

diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c
index 7e8ed96236ce..a68be626017c 100644
--- a/crypto/sha3_generic.c
+++ b/crypto/sha3_generic.c
@@ -18,6 +18,7 @@
 #include <linux/types.h>
 #include <crypto/sha3.h>
 #include <asm/byteorder.h>
+#include <asm/unaligned.h>
 
 #define KECCAK_ROUNDS 24
 
@@ -149,7 +150,7 @@ static int sha3_update(struct shash_desc *desc, const u8 *data,
                         unsigned int i;
 
                         for (i = 0; i < sctx->rsizw; i++)
-                                sctx->st[i] ^= ((u64 *) src)[i];
+                                sctx->st[i] ^= get_unaligned_le64(src + 8 * i);
                         keccakf(sctx->st);
 
                         done += sctx->rsiz;
@@ -174,7 +175,7 @@ static int sha3_final(struct shash_desc *desc, u8 *out)
         sctx->buf[sctx->rsiz - 1] |= 0x80;
 
         for (i = 0; i < sctx->rsizw; i++)
-                sctx->st[i] ^= ((u64 *) sctx->buf)[i];
+                sctx->st[i] ^= get_unaligned_le64(sctx->buf + 8 * i);
 
         keccakf(sctx->st);