[PATCH Xenial SRU] crypto: vmx - IV size failing on skcipher API

[Colin Ian King]

On 27/06/16 16:12, Tim Gardner wrote:
> From: Leonidas Da Silva Barbosa <leosilva at linux.vnet.ibm.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1596557
> 
> IV size was zero on CBC and CTR modes,
> causing a bug triggered by skcipher.
> 
> Fixing this  adding a correct size.
> 
> Signed-off-by: Leonidas Da Silva Barbosa <leosilva at linux.vnet.ibm.com>
> Signed-off-by: Paulo Smorigo <pfsmorigo at linux.vnet.ibm.com>
> Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
> (cherry picked from commit 0d3d054b43719ef33232677ba27ba6097afdafbc)
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  drivers/crypto/vmx/aes_cbc.c | 2 +-
>  drivers/crypto/vmx/aes_ctr.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c
> index f3801b9..3f8bb9a 100644
> --- a/drivers/crypto/vmx/aes_cbc.c
> +++ b/drivers/crypto/vmx/aes_cbc.c
> @@ -191,7 +191,7 @@ struct crypto_alg p8_aes_cbc_alg = {
>  	.cra_init = p8_aes_cbc_init,
>  	.cra_exit = p8_aes_cbc_exit,
>  	.cra_blkcipher = {
> -			  .ivsize = 0,
> +			  .ivsize = AES_BLOCK_SIZE,
>  			  .min_keysize = AES_MIN_KEY_SIZE,
>  			  .max_keysize = AES_MAX_KEY_SIZE,
>  			  .setkey = p8_aes_cbc_setkey,
> diff --git a/drivers/crypto/vmx/aes_ctr.c b/drivers/crypto/vmx/aes_ctr.c
> index 404a1b6..72f1389 100644
> --- a/drivers/crypto/vmx/aes_ctr.c
> +++ b/drivers/crypto/vmx/aes_ctr.c
> @@ -175,7 +175,7 @@ struct crypto_alg p8_aes_ctr_alg = {
>  	.cra_init = p8_aes_ctr_init,
>  	.cra_exit = p8_aes_ctr_exit,
>  	.cra_blkcipher = {
> -			  .ivsize = 0,
> +			  .ivsize = AES_BLOCK_SIZE,
>  			  .min_keysize = AES_MIN_KEY_SIZE,
>  			  .max_keysize = AES_MAX_KEY_SIZE,
>  			  .setkey = p8_aes_ctr_setkey,
> 
Looks sensible to me, clean upstream cherry pick.

Acked-by: Colin Ian King <colin.king at canonical.com>