diff options
| author | Kees Cook <keescook@chromium.org> | 2019-11-26 22:08:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-20 10:39:47 +0100 |
| commit | c45e9a0c7a703c10b4d1031496b31b9c18683ef4 (patch) | |
| tree | 9878d1f339d2f195ca69a1002680da7ad84669cf /crypto/serpent_generic.c | |
| parent | be7b2eb2e18864d3c6f8c26519518ff6c56d07cf (diff) | |
| download | linux-crypto-c45e9a0c7a703c10b4d1031496b31b9c18683ef4.tar.gz linux-crypto-c45e9a0c7a703c10b4d1031496b31b9c18683ef4.zip | |
crypto: x86 - Regularize glue function prototypes
commit 31701000f52600cb1dd335dec9333addf1a69494 upstream.
The crypto glue performed function prototype casting via macros to make
indirect calls to assembly routines. Instead of performing casts at the
call sites (which trips Control Flow Integrity prototype checking), switch
each prototype to a common standard set of arguments which allows the
removal of the existing macros. In order to keep pointer math unchanged,
internal casting between u128 pointers and u8 pointers is added.
Co-developed-by: João Moreira <joao.moreira@intel.com>
Signed-off-by: João Moreira <joao.moreira@intel.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Ard Biesheuvel <ardb@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/serpent_generic.c')
| -rw-r--r-- | crypto/serpent_generic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c index 56fa665a..492c1d0b 100644 --- a/crypto/serpent_generic.c +++ b/crypto/serpent_generic.c @@ -449,8 +449,9 @@ int serpent_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) } EXPORT_SYMBOL_GPL(serpent_setkey); -void __serpent_encrypt(struct serpent_ctx *ctx, u8 *dst, const u8 *src) +void __serpent_encrypt(const void *c, u8 *dst, const u8 *src) { + const struct serpent_ctx *ctx = c; const u32 *k = ctx->expkey; const __le32 *s = (const __le32 *)src; __le32 *d = (__le32 *)dst; @@ -514,8 +515,9 @@ static void serpent_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) __serpent_encrypt(ctx, dst, src); } -void __serpent_decrypt(struct serpent_ctx *ctx, u8 *dst, const u8 *src) +void __serpent_decrypt(const void *c, u8 *dst, const u8 *src) { + const struct serpent_ctx *ctx = c; const u32 *k = ctx->expkey; const __le32 *s = (const __le32 *)src; __le32 *d = (__le32 *)dst; |