lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 137/639] crypto: tgr192 - fix unaligned memory access
    Date
    From: Eric Biggers <ebiggers@google.com>

    [ 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>
    ---
    crypto/tgr192.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/crypto/tgr192.c b/crypto/tgr192.c
    index 022d3dd76c3b2..f8e1d9f9938f5 100644
    --- a/crypto/tgr192.c
    +++ b/crypto/tgr192.c
    @@ -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;
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:06    [W:4.030 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site