Skip to content

Commit

Permalink
[CRYPTO] aes: Fixed array boundary violation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David McCullough authored and Herbert Xu committed Mar 21, 2006
1 parent 06b42aa commit 55e9dce
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions arch/x86_64/crypto/aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ static inline u8 byte(const u32 x, const unsigned n)
struct aes_ctx
{
u32 key_length;
u32 E[60];
u32 D[60];
u32 buf[120];
};

#define E_KEY ctx->E
#define D_KEY ctx->D
#define E_KEY (&ctx->buf[0])
#define D_KEY (&ctx->buf[60])

static u8 pow_tab[256] __initdata;
static u8 log_tab[256] __initdata;
Expand Down
7 changes: 3 additions & 4 deletions crypto/aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,11 @@ byte(const u32 x, const unsigned n)

struct aes_ctx {
int key_length;
u32 E[60];
u32 D[60];
u32 buf[120];
};

#define E_KEY ctx->E
#define D_KEY ctx->D
#define E_KEY (&ctx->buf[0])
#define D_KEY (&ctx->buf[60])

static u8 pow_tab[256] __initdata;
static u8 log_tab[256] __initdata;
Expand Down

0 comments on commit 55e9dce

Please sign in to comment.