diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-05-30 10:53:08 -0700 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-06-06 14:38:57 +0800 |
| commit | 20a0f9761343fba9b25ea46bd3a3e5e533d974f8 (patch) | |
| tree | 18537f2ebc67317fde7fc936af2f73cc446e87f7 /crypto | |
| parent | 5c6bc4dfa515738149998bb0db2481a4fdead979 (diff) | |
| download | linux-20a0f9761343fba9b25ea46bd3a3e5e533d974f8.tar.gz linux-20a0f9761343fba9b25ea46bd3a3e5e533d974f8.tar.bz2 linux-20a0f9761343fba9b25ea46bd3a3e5e533d974f8.zip | |
crypto: lrw - use correct alignmask
Commit c778f96bf347 ("crypto: lrw - Optimize tweak computation")
incorrectly reduced the alignmask of LRW instances from
'__alignof__(u64) - 1' to '__alignof__(__be32) - 1'.
However, xor_tweak() and setkey() assume that the data and key,
respectively, are aligned to 'be128', which has u64 alignment.
Fix the alignmask to be at least '__alignof__(be128) - 1'.
Fixes: c778f96bf347 ("crypto: lrw - Optimize tweak computation")
Cc: <stable@vger.kernel.org> # v4.20+
Cc: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/lrw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/lrw.c b/crypto/lrw.c index fa302f3f161e..b43ea285b8c7 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -388,7 +388,7 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.base.cra_priority = alg->base.cra_priority; inst->alg.base.cra_blocksize = LRW_BLOCK_SIZE; inst->alg.base.cra_alignmask = alg->base.cra_alignmask | - (__alignof__(__be32) - 1); + (__alignof__(be128) - 1); inst->alg.ivsize = LRW_BLOCK_SIZE; inst->alg.min_keysize = crypto_skcipher_alg_min_keysize(alg) + |