crypto: skcipher - fix aligning block size in skcipher_copy_iv()
authorEric Biggers <ebiggers@google.com>
Mon, 23 Jul 2018 16:57:50 +0000 (09:57 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 3 Aug 2018 10:06:03 +0000 (18:06 +0800)
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>
crypto/skcipher.c

index 7d6a49f..4f6b8da 100644 (file)
@@ -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;