summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-07-23 19:57:50 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2018-08-03 13:06:03 +0300
commit0567fc9e90b9b1c8dbce8a5468758e6206744d4a (patch)
treec5ec7dd05c193c038adb2393a22cbc7bdbd1958d /crypto
parente4a1f7858ab834b2cdddfc51be2f5debae782029 (diff)
downloadlinux-0567fc9e90b9b1c8dbce8a5468758e6206744d4a.tar.xz
crypto: skcipher - fix aligning block size in skcipher_copy_iv()
The ALIGN() macro needs to be passed the alignment, not the alignmask (which is the alignment minus 1). Fixes: b286d8b1a690 ("crypto: skcipher - Add skcipher walk interface") Cc: <stable@vger.kernel.org> # v4.10+ 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/skcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 7d6a49fe3047..4f6b8dadaceb 100644
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -398,7 +398,7 @@ static int skcipher_copy_iv(struct skcipher_walk *walk)
unsigned size;
u8 *iv;
- aligned_bs = ALIGN(bs, alignmask);
+ aligned_bs = ALIGN(bs, alignmask + 1);
/* Minimum size to align buffer by alignmask. */
size = alignmask & ~a;