Skip to contentSkip to conversation

FAILED: patch "[PATCH] crypto: skcipher - fix aligning block size in" failed to apply to 4.4-stable tree

PATCH [email protected] 1 participant 1 message Aug 16, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 0567fc9e90b9b1c8dbce8a5468758e6206744d4a Mon Sep 17 00:00:00 2001

From: Eric Biggers <[email protected]>
Date: Mon, 23 Jul 2018 09:57:50 -0700
Subject: [PATCH] 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 <[email protected]> # v4.10+
crypto/skcipher.c +1 -1
index 7d6a49fe3047..4f6b8dadaceb 100644
@@ -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;