From: Kees Cook <keescook@chromium.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Kees Cook <keescook@chromium.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com,
Tudor-Dan Ambarus <tudor.ambarus@microchip.com>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Arnd Bergmann <arnd@arndb.de>, Will Deacon <will.deacon@arm.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
David Woodhouse <dwmw@amazon.co.uk>,
Matthew Wilcox <mawilcox@microsoft.com>,
"David S. Miller" <davem@davemloft.net>,
linux-crypto@vger.kernel.org, qat-linux@intel.com,
linux-kernel@vger.kernel.org
Subject: [PATCH v7 3/9] crypto: ccm: Remove VLA usage
Date: Thu, 2 Aug 2018 15:51:46 -0700 [thread overview]
Message-ID: <20180802225152.19194-4-keescook@chromium.org> (raw)
In-Reply-To: <20180802225152.19194-1-keescook@chromium.org>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
In the quest to remove all stack VLA usage from the kernel[1], this drops
AHASH_REQUEST_ON_STACK by preallocating the ahash request area combined
with the skcipher area (which are not used at the same time).
[1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
crypto/ccm.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/crypto/ccm.c b/crypto/ccm.c
index 0a083342ec8c..b242fd0d3262 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -50,7 +50,10 @@ struct crypto_ccm_req_priv_ctx {
u32 flags;
struct scatterlist src[3];
struct scatterlist dst[3];
- struct skcipher_request skreq;
+ union {
+ struct ahash_request ahreq;
+ struct skcipher_request skreq;
+ };
};
struct cbcmac_tfm_ctx {
@@ -181,7 +184,7 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain,
struct crypto_ccm_req_priv_ctx *pctx = crypto_ccm_reqctx(req);
struct crypto_aead *aead = crypto_aead_reqtfm(req);
struct crypto_ccm_ctx *ctx = crypto_aead_ctx(aead);
- AHASH_REQUEST_ON_STACK(ahreq, ctx->mac);
+ struct ahash_request *ahreq = &pctx->ahreq;
unsigned int assoclen = req->assoclen;
struct scatterlist sg[3];
u8 *odata = pctx->odata;
@@ -427,7 +430,7 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm)
crypto_aead_set_reqsize(
tfm,
align + sizeof(struct crypto_ccm_req_priv_ctx) +
- crypto_skcipher_reqsize(ctr));
+ max(crypto_ahash_reqsize(mac), crypto_skcipher_reqsize(ctr)));
return 0;
--
2.17.1
next prev parent reply other threads:[~2018-08-02 22:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 22:51 [PATCH v7 0/9] crypto: Remove VLA usage Kees Cook
2018-08-02 22:51 ` [PATCH v7 1/9] crypto: xcbc: " Kees Cook
2018-08-02 22:51 ` [PATCH v7 2/9] crypto: cbc: " Kees Cook
2018-08-07 9:47 ` Herbert Xu
2018-08-07 20:52 ` Kees Cook
2018-08-02 22:51 ` Kees Cook [this message]
2018-08-02 22:51 ` [PATCH v7 4/9] crypto: hash: " Kees Cook
2018-08-02 22:51 ` [PATCH v7 5/9] dm: Remove VLA usage from hashes Kees Cook
2018-08-02 22:51 ` [PATCH v7 6/9] crypto alg: Introduce generic max blocksize and alignmask Kees Cook
2018-08-02 22:51 ` [PATCH v7 7/9] crypto: qat: Remove VLA usage Kees Cook
2018-08-02 22:51 ` [PATCH v7 8/9] crypto: shash: Remove VLA usage in unaligned hashing Kees Cook
2018-08-02 22:51 ` [PATCH v7 9/9] crypto: skcipher: Remove VLA usage for SKCIPHER_REQUEST_ON_STACK 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=20180802225152.19194-4-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=agk@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=dm-devel@redhat.com \
--cc=dwmw@amazon.co.uk \
--cc=geert@linux-m68k.org \
--cc=giovanni.cabiddu@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=mawilcox@microsoft.com \
--cc=qat-linux@intel.com \
--cc=snitzer@redhat.com \
--cc=tglx@linutronix.de \
--cc=tudor.ambarus@microchip.com \
--cc=will.deacon@arm.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: 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;
as well as URLs for NNTP newsgroup(s).