Re: [PATCH v5 2/8] crypto: x86/serpent: Remove glue function macros usage

Eric Biggers
2019-11-13T19:34:50Z

On Wed, Nov 13, 2019 at 10:25:10AM -0800, Kees Cook wrote:
> diff --git a/arch/x86/include/asm/crypto/serpent-sse2.h b/arch/x86/include/asm/crypto/serpent-sse2.h
> index 1a345e8a7496..491a5a7d4e15 100644
> --- a/arch/x86/include/asm/crypto/serpent-sse2.h
> +++ b/arch/x86/include/asm/crypto/serpent-sse2.h
> @@ -41,8 +41,7 @@ asmlinkage void __serpent_enc_blk_8way(struct serpent_ctx *ctx, u8 *dst,
> asmlinkage void serpent_dec_blk_8way(struct serpent_ctx *ctx, u8 *dst,
> const u8 *src);
>
> -static inline void serpent_enc_blk_xway(struct serpent_ctx *ctx, u8 *dst,
> - const u8 *src)
> +static inline void serpent_enc_blk_xway(void *ctx, u8 *dst, const u8 *src)
> {
> __serpent_enc_blk_8way(ctx, dst, src, false);
> }
> @@ -53,8 +52,7 @@ static inline void serpent_enc_blk_xway_xor(struct serpent_ctx *ctx, u8 *dst,
> __serpent_enc_blk_8way(ctx, dst, src, true);
> }
>
> -static inline void serpent_dec_blk_xway(struct serpent_ctx *ctx, u8 *dst,
> - const u8 *src)
> +static inline void serpent_dec_blk_xway(void *ctx, u8 *dst, const u8 *src)
> {
> serpent_dec_blk_8way(ctx, dst, src);
> }

Please read this whole file --- these functions are also defined under an #ifdef
CONFIG_X86_32 block, so that part needs to be updated too.

- Eric