Skip to contentSkip to conversation

Patch "crypto: talitos - fix ECB and CBC algs ivsize" has been added to the 4.9-stable tree

DISCUSSION Christophe Leroy 2 participants 2 messages Jun 11, 2020 1 message not in the archive Stable branch

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Le 11/06/2020 à 13:21, [email protected] a écrit :

Quoted 8 lines

This is a note to let you know that I've just added the patch titled

crypto: talitos - fix ECB and CBC algs ivsize

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 6 lines

The filename of the patch is:
crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

As far as I can see, the faulty commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize") only removed .ivsize = AES_BLOCK_SIZE at a wrong place.

The other changes (removal of .ivsize = DES_BLOCK_SIZE and .ivsize = DES3_EDE_BLOCK_SIZE) are not from the faulty patch.

Christophe

Quoted 65 lines

From [email protected] Thu Jun 11 12:53:25 2020
From: Su Kang Yin <[email protected]>
Date: Thu, 11 Jun 2020 18:07:45 +0800
Subject: crypto: talitos - fix ECB and CBC algs ivsize
To: [email protected], [email protected], [email protected]
Cc: Su Kang Yin <[email protected]>, Herbert Xu <[email protected]>, "David S. Miller" <[email protected]>, [email protected]
Message-ID: <[email protected]>

From: Su Kang Yin <[email protected]>

Patch for 4.9 upstream:

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.

---
  drivers/crypto/talitos.c |    4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
drivers/crypto/talitos.c +1 -3
@@ -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,
  			}
  		},
@@ -2687,7 +2687,6 @@ static struct talitos_alg_template drive
  			.cra_ablkcipher = {
  				.min_keysize = DES_KEY_SIZE,
  				.max_keysize = DES_KEY_SIZE,
-				.ivsize = DES_BLOCK_SIZE,
  			}
  		},
  		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |
@@ -2720,7 +2719,6 @@ static struct talitos_alg_template drive
  			.cra_ablkcipher = {
  				.min_keysize = DES3_EDE_KEY_SIZE,
  				.max_keysize = DES3_EDE_KEY_SIZE,
-				.ivsize = DES3_EDE_BLOCK_SIZE,
  			}
  		},
  		.desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU |

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch

maintainer
#2 lore raw
Quoted 15 lines · Christophe Leroy

Le 11/06/2020 à 13:21, [email protected] a écrit :

Quoted 12 lines

This is a note to let you know that I've just added the patch titled

crypto: talitos - fix ECB and CBC algs ivsize

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
and it can be found in the queue-4.9 subdirectory.

Quoted 8 lines
Quoted 2 lines

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

As far as I can see, the faulty commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize") only removed .ivsize = AES_BLOCK_SIZE at a wrong place.

The other changes (removal of .ivsize = DES_BLOCK_SIZE and .ivsize = DES3_EDE_BLOCK_SIZE) are not from the faulty patch.

Now dropped, sorry about that.

greg k-h