From: Kees Cook <keescook@chromium.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "Kees Cook" <keescook@chromium.org>,
"João Moreira" <joao.moreira@lsc.ic.unicamp.br>,
"Eric Biggers" <ebiggers@kernel.org>,
"Sami Tolvanen" <samitolvanen@google.com>,
"David S. Miller" <davem@davemloft.net>,
"Ard Biesheuvel" <ard.biesheuvel@linaro.org>,
"Stephan Mueller" <smueller@chronox.de>,
x86@kernel.org, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org,
kernel-hardening@lists.openwall.com
Subject: [PATCH v4 0/8] crypto: x86: Fix indirect function call casts
Date: Mon, 11 Nov 2019 13:45:44 -0800 [thread overview]
Message-ID: <20191111214552.36717-1-keescook@chromium.org> (raw)
Hi,
Now that Clang's CFI has been fixed to do the right thing with extern
asm functions, this patch series is much simplified. Repeating patch
1's commit log here:
The crypto glue performed function prototype casting to make indirect
calls to assembly routines. Instead of performing casts at the call
sites (which trips Control Flow Integrity prototype checking), create a
set of macros to either declare the prototypes to avoid the need for
casts, or build inline helpers to allow for various aliased functions.
With this series (and the Clang LTO+CFI series) I am able to boot x86
with all crytpo selftests enabled without tripping any CFI checks.
Thanks!
-Kees
v4:
- remove C wrappers (no longer needed after Clang CFI fixes)
- simplify everything to avoid casts as much as possible
v3: https://lore.kernel.org/lkml/20190507161321.34611-1-keescook@chromium.org/
Kees Cook (8):
crypto: x86/glue_helper: Add function glue macros
crypto: x86/serpent: Use new glue function macros
crypto: x86/camellia: Use new glue function macros
crypto: x86/twofish: Use new glue function macros
crypto: x86/cast6: Use new glue function macros
crypto: x86/aesni: Use new glue function macros
crypto: x86/glue_helper: Remove function prototype cast helpers
crypto, x86/sha: Eliminate casts on asm implementations
arch/x86/crypto/aesni-intel_glue.c | 31 +++------
arch/x86/crypto/camellia_aesni_avx2_glue.c | 73 +++++++++------------
arch/x86/crypto/camellia_aesni_avx_glue.c | 63 ++++++------------
arch/x86/crypto/camellia_glue.c | 29 +++------
arch/x86/crypto/cast6_avx_glue.c | 62 ++++++++----------
arch/x86/crypto/serpent_avx2_glue.c | 65 +++++++++----------
arch/x86/crypto/serpent_avx_glue.c | 58 ++++++-----------
arch/x86/crypto/serpent_sse2_glue.c | 24 ++++---
arch/x86/crypto/sha1_ssse3_glue.c | 61 +++++++-----------
arch/x86/crypto/sha256_ssse3_glue.c | 31 ++++-----
arch/x86/crypto/sha512_ssse3_glue.c | 28 ++++----
arch/x86/crypto/twofish_avx_glue.c | 74 ++++++++--------------
arch/x86/crypto/twofish_glue.c | 5 +-
arch/x86/crypto/twofish_glue_3way.c | 25 +++-----
arch/x86/include/asm/crypto/camellia.h | 58 ++++-------------
arch/x86/include/asm/crypto/glue_helper.h | 27 ++++++--
arch/x86/include/asm/crypto/serpent-avx.h | 23 +++----
arch/x86/include/asm/crypto/serpent-sse2.h | 6 +-
arch/x86/include/asm/crypto/twofish.h | 17 ++---
crypto/cast6_generic.c | 6 +-
crypto/serpent_generic.c | 6 +-
include/crypto/cast6.h | 4 +-
include/crypto/serpent.h | 4 +-
include/crypto/xts.h | 2 -
24 files changed, 313 insertions(+), 469 deletions(-)
--
2.17.1
next reply other threads:[~2019-11-11 21:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 21:45 Kees Cook [this message]
2019-11-11 21:45 ` [PATCH v4 1/8] crypto: x86/glue_helper: Add function glue macros Kees Cook
2019-11-11 21:45 ` [PATCH v4 2/8] crypto: x86/serpent: Use new glue function macros Kees Cook
2019-11-11 21:45 ` [PATCH v4 3/8] crypto: x86/camellia: " Kees Cook
2019-11-12 2:41 ` Stephan Müller
2019-11-12 3:14 ` Eric Biggers
2019-11-12 3:16 ` Herbert Xu
2019-11-12 22:56 ` Kees Cook
2019-11-11 21:45 ` [PATCH v4 4/8] crypto: x86/twofish: " Kees Cook
2019-11-11 21:45 ` [PATCH v4 5/8] crypto: x86/cast6: " Kees Cook
2019-11-11 21:45 ` [PATCH v4 6/8] crypto: x86/aesni: " Kees Cook
2019-11-11 21:45 ` [PATCH v4 7/8] crypto: x86/glue_helper: Remove function prototype cast helpers Kees Cook
2019-11-11 21:45 ` [PATCH v4 8/8] crypto, x86/sha: Eliminate casts on asm implementations 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=20191111214552.36717-1-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=ard.biesheuvel@linaro.org \
--cc=davem@davemloft.net \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=joao.moreira@lsc.ic.unicamp.br \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=samitolvanen@google.com \
--cc=smueller@chronox.de \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).