UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Biggers 2017-11-22 11:51:36 -08:00 committed by Herbert Xu
parent ecf3220d88
commit dbd872a123
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/chacha20_generic.c
View File

@ -9,16 +9,12 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include <asm/unaligned.h>
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include <crypto/chacha20.h> #include <crypto/chacha20.h>
#include <crypto/internal/skcipher.h> #include <crypto/internal/skcipher.h>
#include <linux/module.h> #include <linux/module.h>
static inline u32 le32_to_cpuvp(const void *p)
{
return le32_to_cpup(p);
}
static void chacha20_docrypt(u32 *state, u8 *dst, const u8 *src, static void chacha20_docrypt(u32 *state, u8 *dst, const u8 *src,
unsigned int bytes) unsigned int bytes)
{ {
@ -53,10 +49,10 @@ void crypto_chacha20_init(u32 *state, struct chacha20_ctx *ctx, u8 *iv)
state[9] = ctx->key[5]; state[9] = ctx->key[5];
state[10] = ctx->key[6]; state[10] = ctx->key[6];
state[11] = ctx->key[7]; state[11] = ctx->key[7];
state[12] = le32_to_cpuvp(iv + 0); state[12] = get_unaligned_le32(iv + 0);
state[13] = le32_to_cpuvp(iv + 4); state[13] = get_unaligned_le32(iv + 4);
state[14] = le32_to_cpuvp(iv + 8); state[14] = get_unaligned_le32(iv + 8);
state[15] = le32_to_cpuvp(iv + 12); state[15] = get_unaligned_le32(iv + 12);
} }
EXPORT_SYMBOL_GPL(crypto_chacha20_init); EXPORT_SYMBOL_GPL(crypto_chacha20_init);
@ -70,7 +66,7 @@ int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
return -EINVAL; return -EINVAL;
for (i = 0; i < ARRAY_SIZE(ctx->key); i++) for (i = 0; i < ARRAY_SIZE(ctx->key); i++)
ctx->key[i] = le32_to_cpuvp(key + i * sizeof(u32)); ctx->key[i] = get_unaligned_le32(key + i * sizeof(u32));
return 0; return 0;
} }