aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDavid McCullough <david_mccullough@au.securecomputing.com>2006-03-15 05:08:51 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2006-03-21 04:14:10 -0500
commit55e9dce37ddf3ab358ba1d1e9eef4ee4bd8174a6 (patch)
treee850e9052d4db68905cb6c444e269ed7c719301e /crypto
parent06b42aa94b65806b4f8c5fc893ef97a2f491fb32 (diff)
[CRYPTO] aes: Fixed array boundary violation
The AES setkey routine writes 64 bytes to the E_KEY area even though there are only 60 bytes there. It is in fact safe since E_KEY is immediately follwed by D_KEY which is initialised afterwards. However, doing this may trigger undefined behaviour and makes Coverity unhappy. So by combining E_KEY and D_KEY into one array we sidestep this issue altogether. This problem was reported by Adrian Bunk. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/aes.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/aes.c b/crypto/aes.c
index 0a6a5c143686..a5017292e066 100644
--- a/crypto/aes.c
+++ b/crypto/aes.c
@@ -75,12 +75,11 @@ byte(const u32 x, const unsigned n)
75 75
76struct aes_ctx { 76struct aes_ctx {
77 int key_length; 77 int key_length;
78 u32 E[60]; 78 u32 buf[120];
79 u32 D[60];
80}; 79};
81 80
82#define E_KEY ctx->E 81#define E_KEY (&ctx->buf[0])
83#define D_KEY ctx->D 82#define D_KEY (&ctx->buf[60])
84 83
85static u8 pow_tab[256] __initdata; 84static u8 pow_tab[256] __initdata;
86static u8 log_tab[256] __initdata; 85static u8 log_tab[256] __initdata;