4.9-stable patches

added patches:
	crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch

diff --git a/queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch b/queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
new file mode 100644 (file)
index 0000000..a6ec18c
--- /dev/null
+++ b/queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
@@ -0,0 +1,42 @@
+From cantona@cantona.net  Thu Jun 11 15:55:12 2020
+From: Su Kang Yin <cantona@cantona.net>
+Date: Thu, 11 Jun 2020 19:50:47 +0800
+Subject: crypto: talitos - fix ECB and CBC algs ivsize
+To: gregkh@linuxfoundation.org, linux-crypto@vger.kernel.org, christophe.leroy@c-s.fr, stable@vger.kernel.org
+Cc: Su Kang Yin <cantona@cantona.net>, Herbert Xu <herbert@gondor.apana.org.au>, "David S. Miller" <davem@davemloft.net>, linux-kernel@vger.kernel.org
+Message-ID: <20200611115048.21677-1-cantona@cantona.net>
+
+From: Su Kang Yin <cantona@cantona.net>
+
+commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize")
+wrongly modified CBC algs ivsize instead of ECB aggs ivsize.
+
+This restore the CBC algs original ivsize of removes ECB's ones.
+
+Fixes: e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize")
+Signed-off-by: Su Kang Yin <cantona@cantona.net>
+Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/crypto/talitos.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -2636,7 +2636,6 @@ static struct talitos_alg_template drive
+                       .cra_ablkcipher = {
+                               .min_keysize = AES_MIN_KEY_SIZE,
+                               .max_keysize = AES_MAX_KEY_SIZE,
+-                              .ivsize = AES_BLOCK_SIZE,
+                       }
+               },
+               .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
+@@ -2670,6 +2669,7 @@ static struct talitos_alg_template drive
+                       .cra_ablkcipher = {
+                               .min_keysize = AES_MIN_KEY_SIZE,
+                               .max_keysize = AES_MAX_KEY_SIZE,
++                              .ivsize = AES_BLOCK_SIZE,
+                               .setkey = ablkcipher_aes_setkey,
+                       }
+               },

diff --git a/queue-4.9/series b/queue-4.9/series
index 330bbc5a525d5066a71243127427e0380db49cf0..75a41bf18f204446bedc2486c2e3b2cc6d82035d 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,3 +1,4 @@
 ipv6-fix-ipv6_addrform-operation-logic.patch
 vxlan-avoid-infinite-loop-when-suppressing-ns-messages-with-invalid-options.patch
 scsi-return-correct-blkprep-status-code-in-case-scsi_init_io-fails.patch
+crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch