diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-07-23 09:57:50 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-17 21:03:49 +0200 |
| commit | d5cceea6dda72f96fc6b23593bcfbc8821554fd5 (patch) | |
| tree | 0a57c5f4dfbc9760b5ea27b92e4677424997c569 | |
| parent | e990be06acf2c6f667954c09c42701d88f683279 (diff) | |
| download | linux-d5cceea6dda72f96fc6b23593bcfbc8821554fd5.tar.gz | |
crypto: skcipher - fix aligning block size in skcipher_copy_iv()
commit 0567fc9e90b9b1c8dbce8a5468758e6206744d4a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/skcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 0fe2a2923ad0b0..1064ee993e8cb0 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -399,7 +399,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; |