diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 05:19:47 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 05:19:47 +0200 |
| commit | c3afafa47898e34eb49828ec4ac92bcdc81c8f0c (patch) | |
| tree | 055f603e131de9c4d36dafb1856fe69c737152de /arch/arm/crypto | |
| parent | crypto: caam - treat SGT address pointer as u64 (diff) | |
| parent | crypto: vmx - Fix memory corruption caused by p8_ghash (diff) | |
| download | linux-c3afafa47898e34eb49828ec4ac92bcdc81c8f0c.tar.xz linux-c3afafa47898e34eb49828ec4ac92bcdc81c8f0c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in vmx ghash fix.
Diffstat (limited to 'arch/arm/crypto')
| -rw-r--r-- | arch/arm/crypto/aes-ce-glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c index da3c0428507b..aef022a87c53 100644 --- a/arch/arm/crypto/aes-ce-glue.c +++ b/arch/arm/crypto/aes-ce-glue.c @@ -284,7 +284,7 @@ static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE); } - if (nbytes) { + if (walk.nbytes % AES_BLOCK_SIZE) { u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE; u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE; u8 __aligned(8) tail[AES_BLOCK_SIZE]; |