Attachment 921079 Details for Bug 1122937 – A patch for a similar bug in arm32 code

[patch] A patch for a similar bug in arm32 code

arm-aes-fix.patch (text/plain), 2.07 KB, created by Mikuláš Patočka on 2014-07-25 23:18:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikuláš Patočka

Created: 2014-07-25 23:18:17 UTC

Size: 2.07 KB

patch

obsolete

>arm aes: fix encryption of unaligned data
>
>Fix the same alignment bug as in arm64 - we need to pass residue
>unprocessed bytes as the last argument to blkcipher_walk_done.
>
>Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
>Cc: stable@vger.kernel.org	# 3.13+
>
>Index: linux-3.16.0-0.rc6.git1.1.fc21.aarch64/arch/arm/crypto/aesbs-glue.c
>===================================================================
>--- linux-3.16.0-0.rc6.git1.1.fc21.aarch64.orig/arch/arm/crypto/aesbs-glue.c
>+++ linux-3.16.0-0.rc6.git1.1.fc21.aarch64/arch/arm/crypto/aesbs-glue.c
>@@ -137,7 +137,7 @@ static int aesbs_cbc_encrypt(struct blkc
> 				dst += AES_BLOCK_SIZE;
> 			} while (--blocks);
> 		}
>-		err = blkcipher_walk_done(desc, &walk, 0);
>+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
> 	}
> 	return err;
> }
>@@ -158,7 +158,7 @@ static int aesbs_cbc_decrypt(struct blkc
> 		bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
> 				  walk.nbytes, &ctx->dec, walk.iv);
> 		kernel_neon_end();
>-		err = blkcipher_walk_done(desc, &walk, 0);
>+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
> 	}
> 	while (walk.nbytes) {
> 		u32 blocks = walk.nbytes / AES_BLOCK_SIZE;
>@@ -182,7 +182,7 @@ static int aesbs_cbc_decrypt(struct blkc
> 			dst += AES_BLOCK_SIZE;
> 			src += AES_BLOCK_SIZE;
> 		} while (--blocks);
>-		err = blkcipher_walk_done(desc, &walk, 0);
>+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
> 	}
> 	return err;
> }
>@@ -268,7 +268,7 @@ static int aesbs_xts_encrypt(struct blkc
> 		bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
> 				  walk.nbytes, &ctx->enc, walk.iv);
> 		kernel_neon_end();
>-		err = blkcipher_walk_done(desc, &walk, 0);
>+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
> 	}
> 	return err;
> }
>@@ -292,7 +292,7 @@ static int aesbs_xts_decrypt(struct blkc
> 		bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
> 				  walk.nbytes, &ctx->dec, walk.iv);
> 		kernel_neon_end();
>-		err = blkcipher_walk_done(desc, &walk, 0);
>+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
> 	}
> 	return err;
> }

Actions: View | Diff

Attachments on bug 1122937: 920928 | 920929 | 921078 | 921079