Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

crypto: 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+
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Mikulas Patocka 11 years ago
parent
f960d2093f
commit
f3c400ef47
1 changed files with 5 additions and 5 deletions
Unified View Show Diff Stats
  1. 5 5
      arch/arm/crypto/aesbs-glue.c

+ 5 - 5
arch/arm/crypto/aesbs-glue.c
View File 

@@ -137,7 +137,7 @@ static int aesbs_cbc_encrypt(struct blkcipher_desc *desc,
 
 				dst += AES_BLOCK_SIZE;
 
 				dst += AES_BLOCK_SIZE;
 
 			} while (--blocks);
 
 			} while (--blocks);
 
 		}
 
 		}
 
-		err = blkcipher_walk_done(desc, &walk, 0);
 
+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
 
 	}
 
 	}
 
 	return err;
 
 	return err;
 
 }
 
 }
 
@@ -158,7 +158,7 @@ static int aesbs_cbc_decrypt(struct blkcipher_desc *desc,
 
 		bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
 
 		bsaes_cbc_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
 
 				  walk.nbytes, &ctx->dec, walk.iv);
 
 				  walk.nbytes, &ctx->dec, walk.iv);
 
 		kernel_neon_end();
 
 		kernel_neon_end();
 
-		err = blkcipher_walk_done(desc, &walk, 0);
 
+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
 
 	}
 
 	}
 
 	while (walk.nbytes) {
 
 	while (walk.nbytes) {
 
 		u32 blocks = walk.nbytes / AES_BLOCK_SIZE;
 
 		u32 blocks = walk.nbytes / AES_BLOCK_SIZE;
 
@@ -182,7 +182,7 @@ static int aesbs_cbc_decrypt(struct blkcipher_desc *desc,
 
 			dst += AES_BLOCK_SIZE;
 
 			dst += AES_BLOCK_SIZE;
 
 			src += AES_BLOCK_SIZE;
 
 			src += AES_BLOCK_SIZE;
 
 		} while (--blocks);
 
 		} while (--blocks);
 
-		err = blkcipher_walk_done(desc, &walk, 0);
 
+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
 
 	}
 
 	}
 
 	return err;
 
 	return err;
 
 }
 
 }
 
@@ -268,7 +268,7 @@ static int aesbs_xts_encrypt(struct blkcipher_desc *desc,
 
 		bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
 
 		bsaes_xts_encrypt(walk.src.virt.addr, walk.dst.virt.addr,
 
 				  walk.nbytes, &ctx->enc, walk.iv);
 
 				  walk.nbytes, &ctx->enc, walk.iv);
 
 		kernel_neon_end();
 
 		kernel_neon_end();
 
-		err = blkcipher_walk_done(desc, &walk, 0);
 
+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
 
 	}
 
 	}
 
 	return err;
 
 	return err;
 
 }
 
 }
 
@@ -292,7 +292,7 @@ static int aesbs_xts_decrypt(struct blkcipher_desc *desc,
 
 		bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
 
 		bsaes_xts_decrypt(walk.src.virt.addr, walk.dst.virt.addr,
 
 				  walk.nbytes, &ctx->dec, walk.iv);
 
 				  walk.nbytes, &ctx->dec, walk.iv);
 
 		kernel_neon_end();
 
 		kernel_neon_end();
 
-		err = blkcipher_walk_done(desc, &walk, 0);
 
+		err = blkcipher_walk_done(desc, &walk, walk.nbytes % AES_BLOCK_SIZE);
 
 	}
 
 	}
 
 	return err;
 
 	return err;
 
 }
 
 }