summaryrefslogtreecommitdiff
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-12-08 08:23:52 (GMT)
committer Eric Biggers <ebiggers@google.com>2018-12-13 17:34:57 (GMT)
commit1634ff15387557980b5d21ddfe03d4c9b9f7cc89 (patch)
tree7b5d0ec33e8cc6d7afda33553bf8b23b35c06a00
parenta4c5728a9b99c3dfa9e13f2a41edd1ddc9757f0b (diff)
downloadcommon-1634ff15387557980b5d21ddfe03d4c9b9f7cc89.zip
common-1634ff15387557980b5d21ddfe03d4c9b9f7cc89.tar.gz
common-1634ff15387557980b5d21ddfe03d4c9b9f7cc89.tar.bz2
UPSTREAM: crypto: testmgr - fix overlap in chunked tests again
Commit 7e4c7f17cde2 ("crypto: testmgr - avoid overlap in chunked tests") attempted to address a problem in the crypto testmgr code where chunked test cases are copied to memory in a way that results in overlap. However, the fix recreated the exact same issue for other chunked tests, by putting IDX3 within 492 bytes of IDX1, which causes overlap if the first chunk exceeds 492 bytes, which is the case for at least one of the xts(aes) test cases. So increase IDX3 by another 1000 bytes. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit 04b46fbdea5e31ffd745a34fa61269a69ba9f47a) Bug: 112008522 Test: As series, see Ic61c13b53facfd2173065be715a7ee5f3af8760b Change-Id: If698e9e3c6ba40fc2e59c86e7a54acbe4c6a5278 Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat
-rw-r--r--crypto/testmgr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index e60837c..e187ac9 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -62,7 +62,7 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
*/
#define IDX1 32
#define IDX2 32400
-#define IDX3 511
+#define IDX3 1511
#define IDX4 8193
#define IDX5 22222
#define IDX6 17101