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

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

[Christophe Leroy]

Le 11/06/2020 à 13:21, gregkh@linuxfoundation.org a écrit :
> 
> 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.
> 
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> 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

> 
> 
>  From cantona@cantona.net  Thu Jun 11 12:53:25 2020
> From: Su Kang Yin <cantona@cantona.net>
> Date: Thu, 11 Jun 2020 18:07:45 +0800
> Subject: crypto: talitos - fix ECB and CBC algs ivsize
> To: gregkh@linuxfoundation.org, linux-crypto@vger.kernel.org, christophe.leroy@c-s.fr
> 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: <20200611100745.6513-1-cantona@cantona.net>
> 
> From: Su Kang Yin <cantona@cantona.net>
> 
> 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.
> 
> Signed-off-by: Su Kang Yin <cantona@cantona.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>   drivers/crypto/talitos.c |    4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> --- 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,
>   			}
>   		},
> @@ -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 cantona@cantona.net are
> 
> queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch
> 

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

[Greg KH]

On Thu, Jun 11, 2020 at 01:27:34PM +0200, Christophe Leroy wrote:
> 
> 
> Le 11/06/2020 à 13:21, gregkh@linuxfoundation.org a écrit :
> > 
> > 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.
> > 
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> 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