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:01:10 +0200 |
| commit | 0f2981ee03ff3f9678a43592065d0ae95de451dc (patch) | |
| tree | 457ffc305380c2da05a68c591b0d6680f3626bec /crypto | |
| parent | 68432fd1665b6c0647cf2cce6c218fea4761a5b4 (diff) | |
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>
Diffstat (limited to 'crypto')
| -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 11af5fd6a443..5900c8a43dea 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; |