crypto: skcipher - fix aligning block size in skcipher_copy_iv()

BugLink: https://bugs.launchpad.net/bugs/1835845
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 11af5fd6a443570550e1dac5b0a429b2cae801b1..5900c8a43deafcab81429147dee36255cab1a5fa 100644 (file)
--- 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;