crypto: testmgr - Check all test vector lengths
As we cannot guarantee the availability of contiguous pages at run-time, all test vectors must either fit within a page, or use scatter lists. In some cases vectors were not checked as to whether they fit inside a page. This patch adds all the missing checks. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
f3d8fe4049
commit
fd57f22a09
|
@ -185,6 +185,10 @@ static int test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
|
||||||
|
|
||||||
hash_buff = xbuf[0];
|
hash_buff = xbuf[0];
|
||||||
|
|
||||||
|
ret = -EINVAL;
|
||||||
|
if (WARN_ON(template[i].psize > PAGE_SIZE))
|
||||||
|
goto out;
|
||||||
|
|
||||||
memcpy(hash_buff, template[i].plaintext, template[i].psize);
|
memcpy(hash_buff, template[i].plaintext, template[i].psize);
|
||||||
sg_init_one(&sg[0], hash_buff, template[i].psize);
|
sg_init_one(&sg[0], hash_buff, template[i].psize);
|
||||||
|
|
||||||
|
@ -238,7 +242,11 @@ static int test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
|
||||||
|
|
||||||
temp = 0;
|
temp = 0;
|
||||||
sg_init_table(sg, template[i].np);
|
sg_init_table(sg, template[i].np);
|
||||||
|
ret = -EINVAL;
|
||||||
for (k = 0; k < template[i].np; k++) {
|
for (k = 0; k < template[i].np; k++) {
|
||||||
|
if (WARN_ON(offset_in_page(IDX[k]) +
|
||||||
|
template[i].tap[k] > PAGE_SIZE))
|
||||||
|
goto out;
|
||||||
sg_set_buf(&sg[k],
|
sg_set_buf(&sg[k],
|
||||||
memcpy(xbuf[IDX[k] >> PAGE_SHIFT] +
|
memcpy(xbuf[IDX[k] >> PAGE_SHIFT] +
|
||||||
offset_in_page(IDX[k]),
|
offset_in_page(IDX[k]),
|
||||||
|
@ -357,6 +365,11 @@ static int test_aead(struct crypto_aead *tfm, int enc,
|
||||||
input = xbuf[0];
|
input = xbuf[0];
|
||||||
assoc = axbuf[0];
|
assoc = axbuf[0];
|
||||||
|
|
||||||
|
ret = -EINVAL;
|
||||||
|
if (WARN_ON(template[i].ilen > PAGE_SIZE ||
|
||||||
|
template[i].alen > PAGE_SIZE))
|
||||||
|
goto out;
|
||||||
|
|
||||||
memcpy(input, template[i].input, template[i].ilen);
|
memcpy(input, template[i].input, template[i].ilen);
|
||||||
memcpy(assoc, template[i].assoc, template[i].alen);
|
memcpy(assoc, template[i].assoc, template[i].alen);
|
||||||
if (template[i].iv)
|
if (template[i].iv)
|
||||||
|
@ -516,7 +529,11 @@ static int test_aead(struct crypto_aead *tfm, int enc,
|
||||||
}
|
}
|
||||||
|
|
||||||
sg_init_table(asg, template[i].anp);
|
sg_init_table(asg, template[i].anp);
|
||||||
|
ret = -EINVAL;
|
||||||
for (k = 0, temp = 0; k < template[i].anp; k++) {
|
for (k = 0, temp = 0; k < template[i].anp; k++) {
|
||||||
|
if (WARN_ON(offset_in_page(IDX[k]) +
|
||||||
|
template[i].atap[k] > PAGE_SIZE))
|
||||||
|
goto out;
|
||||||
sg_set_buf(&asg[k],
|
sg_set_buf(&asg[k],
|
||||||
memcpy(axbuf[IDX[k] >> PAGE_SHIFT] +
|
memcpy(axbuf[IDX[k] >> PAGE_SHIFT] +
|
||||||
offset_in_page(IDX[k]),
|
offset_in_page(IDX[k]),
|
||||||
|
@ -650,6 +667,10 @@ static int test_cipher(struct crypto_cipher *tfm, int enc,
|
||||||
|
|
||||||
j++;
|
j++;
|
||||||
|
|
||||||
|
ret = -EINVAL;
|
||||||
|
if (WARN_ON(template[i].ilen > PAGE_SIZE))
|
||||||
|
goto out;
|
||||||
|
|
||||||
data = xbuf[0];
|
data = xbuf[0];
|
||||||
memcpy(data, template[i].input, template[i].ilen);
|
memcpy(data, template[i].input, template[i].ilen);
|
||||||
|
|
||||||
|
@ -741,6 +762,10 @@ static int test_skcipher(struct crypto_ablkcipher *tfm, int enc,
|
||||||
if (!(template[i].np)) {
|
if (!(template[i].np)) {
|
||||||
j++;
|
j++;
|
||||||
|
|
||||||
|
ret = -EINVAL;
|
||||||
|
if (WARN_ON(template[i].ilen > PAGE_SIZE))
|
||||||
|
goto out;
|
||||||
|
|
||||||
data = xbuf[0];
|
data = xbuf[0];
|
||||||
memcpy(data, template[i].input, template[i].ilen);
|
memcpy(data, template[i].input, template[i].ilen);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue