Linux cryptographic layer development
 help / color / mirror / Atom feed
From: Roel Kluin <roel.kluin@gmail.com>
To: herbert@gondor.apana.org.au, linux-crypto@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] crypto: Write outside array bounds
Date: Tue, 28 Jul 2009 17:07:11 +0200	[thread overview]
Message-ID: <4A6F141F.5000904@gmail.com> (raw)

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.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
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.

diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 7524ba3..dd8c628 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -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))
 
 /*

             reply	other threads:[~2009-07-28 15:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-28 15:07 Roel Kluin [this message]
2009-07-28 15:29 ` [PATCH] crypto: Write outside array bounds Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A6F141F.5000904@gmail.com \
    --to=roel.kluin@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox