From: Greg Kroah-Hartman Date: Thu, 11 Jun 2020 13:58:05 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v5.4.47~128 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a1ca161629365a4e2c15d244f27b11ecf50c0b9;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..129282ba960 --- /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 +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 , Herbert Xu , "David S. Miller" , linux-kernel@vger.kernel.org +Message-ID: <20200611115048.21677-1-cantona@cantona.net> + +From: Su Kang Yin + +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 +Reviewed-by: Christophe Leroy +Signed-off-by: Greg Kroah-Hartman + +--- + 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 fc3193b2e9a..26cbb67d304 100644 --- 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