From: Ondrej Mosnáček <omosnacek@gmail.com>
Date: Fri, 23 Sep 2016 08:47:32 +0000 (+0200)
Subject: crypto: gcm - Fix IV buffer size in crypto_gcm_setkey
X-Git-Tag: v3.16.40~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=615e796a8828fc251b2902fbe5ba48b952e25386;p=thirdparty%2Fkernel%2Fstable.git

crypto: gcm - Fix IV buffer size in crypto_gcm_setkey

commit 50d2e6dc1f83db0563c7d6603967bf9585ce934b upstream.

The cipher block size for GCM is 16 bytes, and thus the CTR transform
used in crypto_gcm_setkey() will also expect a 16-byte IV. However,
the code currently reserves only 8 bytes for the IV, causing
an out-of-bounds access in the CTR transform. This patch fixes
the issue by setting the size of the IV buffer to 16 bytes.

Fixes: 84c911523020 ("[CRYPTO] gcm: Add support for async ciphers")
Signed-off-by: Ondrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/crypto/gcm.c b/crypto/gcm.c
index d2a0f7371cf0a..49b6fb20cceba 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -109,7 +109,7 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key,
 	struct crypto_ablkcipher *ctr = ctx->ctr;
 	struct {
 		be128 hash;
-		u8 iv[8];
+		u8 iv[16];
 
 		struct crypto_gcm_setkey_result result;