4.19-stable patches

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

diff --git a/queue-4.19/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch b/queue-4.19/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
new file mode 100644 (file)
index 0000000..129282b
--- /dev/null
+++ b/queue-4.19/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
+@@ -2670,7 +2670,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 |
+@@ -2704,6 +2703,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.19/series b/queue-4.19/series
index fc3193b2e9af3e424aa8eb5b8d6ce2f79440093f..26cbb67d304d0e0a18be27917081ca9b01aef430 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -11,3 +11,4 @@ x86-uaccess-inhibit-speculation-past-access_ok-in-user_access_begin.patch
 lib-reduce-user_access_begin-boundaries-in-strncpy_from_user-and-strnlen_user.patch
 btrfs-merge-btrfs_find_device-and-find_device.patch
 btrfs-detect-unbalanced-tree-with-empty-leaf-before-crashing-btree-operations.patch
+crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch