From: Kees Cook <keescook@chromium.org> To: Herbert Xu <herbert@gondor.apana.org.au> Cc: Giovanni Cabiddu <giovanni.cabiddu@intel.com>, Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>, Eric Biggers <ebiggers@google.com>, Mike Snitzer <snitzer@redhat.com>, "Gustavo A. R. Silva" <gustavo@embeddedor.com>, qat-linux@intel.com, linux-kernel@vger.kernel.org, Masahiro Yamada <yamada.masahiro@socionext.com>, dm-devel@redhat.com, linux-crypto@vger.kernel.org, Lars Persson <larper@axis.com>, Tim Chen <tim.c.chen@linux.intel.com>, "David S. Miller" <davem@davemloft.net>, Alasdair Kergon <agk@redhat.com>, Rabin Vincent <rabinv@axis.com> Subject: [PATCH v4 02/14] crypto: cbc: Remove VLA usage Date: Wed, 11 Jul 2018 13:36:07 -0700 [thread overview] Message-ID: <20180711203619.1020-3-keescook@chromium.org> (raw) In-Reply-To: <20180711203619.1020-1-keescook@chromium.org> In the quest to remove all stack VLA usage from the kernel[1], this uses the upper bounds on blocksize. Since this is always a cipher blocksize, use the existing cipher max blocksize. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook <keescook@chromium.org> --- include/crypto/cbc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/crypto/cbc.h b/include/crypto/cbc.h index f5b8bfc22e6d..47db0aac2ab9 100644 --- a/include/crypto/cbc.h +++ b/include/crypto/cbc.h @@ -113,7 +113,9 @@ static inline int crypto_cbc_decrypt_inplace( unsigned int bsize = crypto_skcipher_blocksize(tfm); unsigned int nbytes = walk->nbytes; u8 *src = walk->src.virt.addr; - u8 last_iv[bsize]; + u8 last_iv[MAX_CIPHER_BLOCKSIZE]; + + BUG_ON(bsize > sizeof(last_iv)); /* Start of the last block. */ src += nbytes - (nbytes & (bsize - 1)) - bsize; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Kees Cook <keescook@chromium.org> To: Herbert Xu <herbert@gondor.apana.org.au> Cc: Kees Cook <keescook@chromium.org>, "Gustavo A. R. Silva" <gustavo@embeddedor.com>, Arnd Bergmann <arnd@arndb.de>, Eric Biggers <ebiggers@google.com>, Alasdair Kergon <agk@redhat.com>, Giovanni Cabiddu <giovanni.cabiddu@intel.com>, Lars Persson <larper@axis.com>, Mike Snitzer <snitzer@redhat.com>, Rabin Vincent <rabinv@axis.com>, Tim Chen <tim.c.chen@linux.intel.com>, "David S. Miller" <davem@davemloft.net>, Masahiro Yamada <yamada.masahiro@socionext.com>, linux-crypto@vger.kernel.org, qat-linux@intel.com, dm-devel@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 02/14] crypto: cbc: Remove VLA usage Date: Wed, 11 Jul 2018 13:36:07 -0700 [thread overview] Message-ID: <20180711203619.1020-3-keescook@chromium.org> (raw) In-Reply-To: <20180711203619.1020-1-keescook@chromium.org> In the quest to remove all stack VLA usage from the kernel[1], this uses the upper bounds on blocksize. Since this is always a cipher blocksize, use the existing cipher max blocksize. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Signed-off-by: Kees Cook <keescook@chromium.org> --- include/crypto/cbc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/crypto/cbc.h b/include/crypto/cbc.h index f5b8bfc22e6d..47db0aac2ab9 100644 --- a/include/crypto/cbc.h +++ b/include/crypto/cbc.h @@ -113,7 +113,9 @@ static inline int crypto_cbc_decrypt_inplace( unsigned int bsize = crypto_skcipher_blocksize(tfm); unsigned int nbytes = walk->nbytes; u8 *src = walk->src.virt.addr; - u8 last_iv[bsize]; + u8 last_iv[MAX_CIPHER_BLOCKSIZE]; + + BUG_ON(bsize > sizeof(last_iv)); /* Start of the last block. */ src += nbytes - (nbytes & (bsize - 1)) - bsize; -- 2.17.1
next prev parent reply other threads:[~2018-07-11 20:36 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-11 20:36 [PATCH v4 00/14] crypto: Remove VLA usage Kees Cook 2018-07-11 20:36 ` [PATCH v4 01/14] crypto: xcbc: " Kees Cook 2018-07-11 20:36 ` Kees Cook 2018-07-11 20:36 ` Kees Cook [this message] 2018-07-11 20:36 ` [PATCH v4 02/14] crypto: cbc: " Kees Cook 2018-07-11 20:36 ` [PATCH v4 03/14] crypto: shash: " Kees Cook 2018-07-11 20:36 ` [PATCH v4 04/14] dm integrity: " Kees Cook 2018-07-11 20:36 ` [PATCH v4 05/14] crypto: ahash: " Kees Cook 2018-07-11 20:36 ` Kees Cook 2018-07-11 20:36 ` [PATCH v4 06/14] dm verity fec: " Kees Cook 2018-07-11 20:36 ` Kees Cook 2018-07-11 20:36 ` [PATCH v4 07/14] crypto alg: Introduce generic max blocksize and alignmask Kees Cook 2018-07-11 20:36 ` Kees Cook 2018-07-11 20:36 ` [PATCH v4 08/14] crypto: qat: Remove VLA usage Kees Cook 2018-07-11 20:36 ` [PATCH v4 09/14] crypto: shash: Remove VLA usage in unaligned hashing Kees Cook 2018-07-11 20:36 ` [PATCH v4 10/14] kbuild: Introduce FRAME_WARN_BUMP_FLAG Kees Cook 2018-07-11 20:36 ` Kees Cook 2018-07-11 20:36 ` [PATCH v4 11/14] treewide: Prepare to remove VLA usage for AHASH_REQUEST_ON_STACK Kees Cook 2018-07-12 16:02 ` Arnd Bergmann 2018-07-12 16:02 ` Arnd Bergmann 2018-07-12 20:17 ` Kees Cook 2018-07-12 20:17 ` Kees Cook 2018-07-12 21:38 ` Arnd Bergmann 2018-07-12 21:38 ` Arnd Bergmann 2018-07-13 0:40 ` Herbert Xu 2018-07-13 0:40 ` Herbert Xu 2018-07-13 3:33 ` Kees Cook 2018-07-13 3:33 ` Kees Cook 2018-07-13 3:44 ` Herbert Xu 2018-07-13 3:44 ` Herbert Xu 2018-07-13 5:17 ` Kees Cook 2018-07-13 5:17 ` Kees Cook 2018-07-13 5:20 ` Herbert Xu 2018-07-13 5:20 ` Herbert Xu 2018-07-13 6:00 ` Kees Cook 2018-07-13 6:00 ` Kees Cook 2018-07-13 10:14 ` Arnd Bergmann 2018-07-13 10:14 ` Arnd Bergmann 2018-07-15 4:28 ` Kees Cook 2018-07-15 4:28 ` Kees Cook 2018-07-17 20:59 ` Arnd Bergmann 2018-07-17 20:59 ` Arnd Bergmann 2018-07-18 14:50 ` Ard Biesheuvel 2018-07-18 14:50 ` Ard Biesheuvel 2018-07-18 15:19 ` Ard Biesheuvel 2018-07-18 15:19 ` Ard Biesheuvel 2018-07-18 15:33 ` Arnd Bergmann 2018-07-18 15:33 ` Arnd Bergmann 2018-07-18 15:33 ` Ard Biesheuvel 2018-07-18 15:33 ` Ard Biesheuvel 2018-07-19 2:51 ` Kees Cook 2018-07-19 2:51 ` Kees Cook 2018-07-19 2:55 ` Ard Biesheuvel 2018-07-19 2:55 ` Ard Biesheuvel 2018-07-19 3:09 ` Kees Cook 2018-07-19 3:09 ` Kees Cook 2018-07-19 3:13 ` Ard Biesheuvel 2018-07-19 3:13 ` Ard Biesheuvel 2018-07-19 14:54 ` Ard Biesheuvel 2018-07-19 14:54 ` Ard Biesheuvel 2018-07-19 18:44 ` Kees Cook 2018-07-19 18:44 ` Kees Cook 2018-07-13 6:16 ` Kees Cook 2018-07-13 6:16 ` Kees Cook 2018-07-13 6:22 ` Herbert Xu 2018-07-13 6:22 ` Herbert Xu 2018-07-14 3:07 ` Kees Cook 2018-07-14 3:07 ` Kees Cook 2018-07-15 2:44 ` Herbert Xu 2018-07-15 2:44 ` Herbert Xu 2018-07-15 2:59 ` Kees Cook 2018-07-15 2:59 ` Kees Cook 2018-07-16 0:01 ` Herbert Xu 2018-07-16 0:01 ` Herbert Xu 2018-07-16 3:39 ` Kees Cook 2018-07-16 3:39 ` Kees Cook 2018-07-16 7:24 ` Arnd Bergmann 2018-07-16 7:24 ` Arnd Bergmann 2018-07-11 20:36 ` [PATCH v4 12/14] crypto: ahash: Remove " Kees Cook 2018-07-11 20:36 ` [PATCH v4 13/14] rxrpc: Prepare to remove VLA usage for SKCIPHER_REQUEST_ON_STACK Kees Cook 2018-07-12 15:11 ` Arnd Bergmann 2018-07-12 15:11 ` Arnd Bergmann 2018-07-12 15:11 ` Arnd Bergmann 2018-07-12 20:23 ` Kees Cook 2018-07-12 20:23 ` Kees Cook 2018-07-12 20:30 ` Kees Cook 2018-07-12 20:30 ` Kees Cook 2018-07-12 21:15 ` Arnd Bergmann 2018-07-12 21:15 ` Arnd Bergmann 2018-07-12 21:38 ` Kees Cook 2018-07-12 21:38 ` Kees Cook 2018-07-12 21:28 ` David Howells 2018-07-12 21:28 ` David Howells 2018-07-12 21:34 ` Kees Cook 2018-07-12 21:34 ` Kees Cook 2018-07-12 22:05 ` David Howells 2018-07-12 22:05 ` David Howells 2018-07-11 20:36 ` [PATCH v4 14/14] crypto: skcipher: Remove " Kees Cook
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=20180711203619.1020-3-keescook@chromium.org \ --to=keescook@chromium.org \ --cc=agk@redhat.com \ --cc=arnd@arndb.de \ --cc=davem@davemloft.net \ --cc=dm-devel@redhat.com \ --cc=ebiggers@google.com \ --cc=giovanni.cabiddu@intel.com \ --cc=gustavo@embeddedor.com \ --cc=herbert@gondor.apana.org.au \ --cc=larper@axis.com \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=qat-linux@intel.com \ --cc=rabinv@axis.com \ --cc=snitzer@redhat.com \ --cc=tim.c.chen@linux.intel.com \ --cc=yamada.masahiro@socionext.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.