From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F9C3C432C3 for ; Wed, 13 Nov 2019 19:34:50 +0000 (UTC) Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.kernel.org (Postfix) with SMTP id 122B7206D7 for ; Wed, 13 Nov 2019 19:34:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="xuMmI97c" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 122B7206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kernel-hardening-return-17358-kernel-hardening=archiver.kernel.org@lists.openwall.com Received: (qmail 20170 invoked by uid 550); 13 Nov 2019 19:34:44 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Received: (qmail 20136 invoked from network); 13 Nov 2019 19:34:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573673671; bh=o2wXCRnJvMNzkoYmM+/9D8Kea21XKX9mhE/7gJ8wZcY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=xuMmI97cuv61wfFEfbfqXOMSOfwEvQTrHtTzND2TYmYYbeZFqz/HhuTliEczNVTj7 5JVjuWDZoM6PaIjFYWPJPyQHf9VdG61hnR9vKnsKIkpFfUupVwVmdy0xefMgz7akDc knhhNzA11N96sh9u6IwjmEDlGR/qGjbRpZYoyvoA= Date: Wed, 13 Nov 2019 11:34:29 -0800 From: Eric Biggers To: Kees Cook Cc: Herbert Xu , =?iso-8859-1?Q?Jo=E3o?= Moreira , Sami Tolvanen , "David S. Miller" , Ard Biesheuvel , Stephan Mueller , x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: Re: [PATCH v5 2/8] crypto: x86/serpent: Remove glue function macros usage Message-ID: <20191113193428.GB221701@gmail.com> Mail-Followup-To: Kees Cook , Herbert Xu , =?iso-8859-1?Q?Jo=E3o?= Moreira , Sami Tolvanen , "David S. Miller" , Ard Biesheuvel , Stephan Mueller , x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com References: <20191113182516.13545-1-keescook@chromium.org> <20191113182516.13545-3-keescook@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191113182516.13545-3-keescook@chromium.org> User-Agent: Mutt/1.10.1 (2018-07-13) 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