]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit - crypto/chacha_generic.c
crypto: chacha20 - Use unaligned access macros when loading key and IV
authorEric Biggers <ebiggers@google.com>
Wed, 22 Nov 2017 19:51:36 +0000 (11:51 -0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 29 Nov 2017 06:33:32 +0000 (17:33 +1100)
commitdbd872a123fab81d0fa235a265c39e5ccdf735b3
tree5c69967a0c96c4ae9504d4ee7b6d2c0ddea1373c
parentecf3220d882ae84844909ed6323032aac47aff93
crypto: chacha20 - Use unaligned access macros when loading key and IV

The generic ChaCha20 implementation has a cra_alignmask of 3, which
ensures that the key passed into crypto_chacha20_setkey() and the IV
passed into crypto_chacha20_init() are 4-byte aligned.  However, these
functions are also called from the ARM and ARM64 implementations of
ChaCha20, which intentionally do not have a cra_alignmask set.  This is
broken because 32-bit words are being loaded from potentially-unaligned
buffers without the unaligned access macros.

Fix it by using the unaligned access macros when loading the key and IV.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/chacha20_generic.c