crypto: Write outside array bounds
PATCH 1/1 crypto: Write outside array bounds
In crypto_aes_expand_key() loop8(i) writes up to ctx->key_enc[8*i+15], at most
63. ctx->key_enc has length (15*16)/4 == 60, so the last 16 bytes of key_enc will overflow into ctx->key_dec.
---
Found with Parfait, http://research.sun.com/projects/parfait/
This concerns crypto/aes_generic.c, function crypto_aes_expand_key(), macro loop8() on line 1249.
1244: ctx->key_enc[4] = le32_to_cpu(key[4]); 1245: ctx->key_enc[5] = le32_to_cpu(key[5]); 1246: ctx->key_enc[6] = le32_to_cpu(key[6]); 1247: t = ctx->key_enc[7] = le32_to_cpu(key[7]); 1248: for (i = 0; i < 7; ++i)
1249: loop8(i);
1250: break;
1251: }
1252:
1253: ctx->key_dec[0] = ctx->key_enc[key_len + 24];
1254: ctx->key_dec[1] = ctx->key_enc[key_len + 25];
please review.
include/crypto/aes.h +1 -1
@@ -14,7 +14,7 @@#define AES_KEYSIZE_192 24#define AES_KEYSIZE_256 32#define AES_BLOCK_SIZE 16 -#define AES_MAX_KEYLENGTH (15 * 16) +#define AES_MAX_KEYLENGTH (16 * 16)#define AES_MAX_KEYLENGTH_U32 (AES_MAX_KEYLENGTH / sizeof(u32))/*
Herbert Xu
maintainerQuoted 5 lines · Roel Kluin
In
crypto_aes_expand_key()loop8(i) writes up to ctx->key_enc[8*i+15], at most
63.ctx->key_enchas length (15*16)/4 == 60, so the last 16 bytes ofkey_encwill overflow intoctx->key_dec.Signed-off-by Roel Kluin <[email protected]>
This is already fixed by
commit 7b4ffcf953f091a815df081911c5e75c8a38418d
Author: Phil Carmody <[email protected]> Date: Fri Jul 24 13:59:17 2009 +0800
crypto: aes - Undefined behaviour in crypto_aes_expand_key
Thanks,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt