On Wed, Nov 13, 2019 at 11:39:12AM -0800, Eric Biggers wrote: > On Wed, Nov 13, 2019 at 10:25:11AM -0800, Kees Cook wrote: > > In order to remove the callsite function casts, regularize the function > > prototypes for helpers to avoid triggering Control-Flow Integrity checks > > during indirect function calls. Where needed, to avoid changes to > > pointer math, u8 pointers are internally cast back to u128 pointers. > > > > Co-developed-by: João Moreira <joao.moreira@xxxxxxxxx> > > Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> > > --- > > arch/x86/crypto/camellia_aesni_avx2_glue.c | 74 ++++++++++------------ > > arch/x86/crypto/camellia_aesni_avx_glue.c | 74 ++++++++++------------ > > arch/x86/crypto/camellia_glue.c | 45 +++++++------ > > arch/x86/include/asm/crypto/camellia.h | 64 ++++++++----------- > > 4 files changed, 119 insertions(+), 138 deletions(-) > > > > diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c b/arch/x86/crypto/camellia_aesni_avx2_glue.c > > index a4f00128ea55..a68d54fc2dde 100644 > > --- a/arch/x86/crypto/camellia_aesni_avx2_glue.c > > +++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c > > @@ -19,20 +19,17 @@ > > #define CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS 32 > > > > /* 32-way AVX2/AES-NI parallel cipher functions */ > > -asmlinkage void camellia_ecb_enc_32way(struct camellia_ctx *ctx, u8 *dst, > > - const u8 *src); > > -asmlinkage void camellia_ecb_dec_32way(struct camellia_ctx *ctx, u8 *dst, > > - const u8 *src); > > +asmlinkage void camellia_ecb_enc_32way(void *ctx, u8 *dst, const u8 *src); > > +asmlinkage void camellia_ecb_dec_32way(void *ctx, u8 *dst, const u8 *src); > > > > -asmlinkage void camellia_cbc_dec_32way(struct camellia_ctx *ctx, u8 *dst, > > - const u8 *src); > > -asmlinkage void camellia_ctr_32way(struct camellia_ctx *ctx, u8 *dst, > > - const u8 *src, le128 *iv); > > +asmlinkage void camellia_cbc_dec_32way(void *ctx, u8 *dst, const u8 *src); > > +asmlinkage void camellia_ctr_32way(void *ctx, u8 *dst, const u8 *src, > > + le128 *iv); > > > > -asmlinkage void camellia_xts_enc_32way(struct camellia_ctx *ctx, u8 *dst, > > - const u8 *src, le128 *iv); > > -asmlinkage void camellia_xts_dec_32way(struct camellia_ctx *ctx, u8 *dst, > > - const u8 *src, le128 *iv); > > +asmlinkage void camellia_xts_enc_32way(void *ctx, u8 *dst, const u8 *src, > > + le128 *iv); > > +asmlinkage void camellia_xts_dec_32way(void *ctx, u8 *dst, const u8 *src, > > + le128 *iv); > > As long as the type of all the 'ctx' arguments is being changed anyway, can you > please make them const, as they should have been all along? This applies to all > the algorithms. I.e., something like this: > > [const diff] Awesome, thanks! I've incorporated this into the series now. :) -- Kees Cook
