Re: [PATCH 1/3] crypto: properly handle null input and assoc dataaead test vectors

From: Jarod Wilson
Date: Thu Apr 23 2009 - 13:31:11 EST


On 04/20/2009 02:23 AM, Herbert Xu wrote:
On Wed, Apr 15, 2009 at 09:36:10AM -0400, Jarod Wilson wrote:
Currenty, if either input or associated data are null in an aead
test vector, we'll have random contents of the input and assoc
arrays. Similar to the iv, play it safe and zero out the contents.

Signed-off-by: Jarod Wilson<jarod@xxxxxxxxxx>

This patch doesn't make sense unless you were getting a crash
without it.

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index bfee6e9..a8bdcb3 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -314,8 +314,18 @@ static int test_aead(struct crypto_aead *tfm, int enc,
input = xbuf[0];
assoc = axbuf[0];

- memcpy(input, template[i].input, template[i].ilen);
- memcpy(assoc, template[i].assoc, template[i].alen);
+ if (template[i].input)
+ memcpy(input, template[i].input,
+ template[i].ilen);
+ else
+ memset(input, 0, MAX_IVLEN);

If template[i].input was really NULL then the memcpy should crash.

I needed to do this for some extended testing elsewhere in similar-looking code, where input could indeed be NULL and I did encounter crashes, but its not reproduceable within tcrypt/testmgr itself, so indeed, not necessary here.

--
Jarod Wilson
jarod@xxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/