]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
crypto: tgr192 - fix unaligned memory access
authorEric Biggers <ebiggers@google.com>
Thu, 10 Jan 2019 20:17:58 +0000 (12:17 -0800)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 05:29:37 +0000 (00:29 -0500)
BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit f990f7fb58ac8ac9a43316f09a48cff1a49dda42 ]

Fix an unaligned memory access in tgr192_transform() by using the
unaligned access helpers.

Fixes: 06ace7a9bafe ("[CRYPTO] Use standard byte order macros wherever possible")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
crypto/tgr192.c

index 321bc6ff2a9d1ff714b3f27e49b68f0d48ce17e0..904c8444aa0a210c6a14757b96bf0b8db48fcebf 100644 (file)
@@ -25,8 +25,9 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <asm/byteorder.h>
 #include <linux/types.h>
+#include <asm/byteorder.h>
+#include <asm/unaligned.h>
 
 #define TGR192_DIGEST_SIZE 24
 #define TGR160_DIGEST_SIZE 20
@@ -468,10 +469,9 @@ static void tgr192_transform(struct tgr192_ctx *tctx, const u8 * data)
        u64 a, b, c, aa, bb, cc;
        u64 x[8];
        int i;
-       const __le64 *ptr = (const __le64 *)data;
 
        for (i = 0; i < 8; i++)
-               x[i] = le64_to_cpu(ptr[i]);
+               x[i] = get_unaligned_le64(data + i * sizeof(__le64));
 
        /* save */
        a = aa = tctx->a;