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=-8.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 5DF37C43141 for ; Wed, 13 Nov 2019 20:04:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8F49206E6 for ; Wed, 13 Nov 2019 20:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573675465; bh=LZIwwPqo6cGSYYo3omBkRDVFip05Z5LaeW4j2tDTV2g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=TYIagd/rcC+CU6QHoDzl+GLTYs34fLQy1tYU0iSbhcHup980xUv5QDAblkj3+uo/0 01xqn2KtzOUBRDFK1vZDynQZVfq1vxs5/1tgaAPRDE5CsPjEyIbxh99jId5M0RdCMH vCNMhF6EVfauv4d8pRG/U5KpTN17J4xViwKUZeoM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726393AbfKMUEX (ORCPT ); Wed, 13 Nov 2019 15:04:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:46934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbfKMUEW (ORCPT ); Wed, 13 Nov 2019 15:04:22 -0500 Received: from gmail.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64D7B206E5; Wed, 13 Nov 2019 20:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573675462; bh=LZIwwPqo6cGSYYo3omBkRDVFip05Z5LaeW4j2tDTV2g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lhnZFjvlbtfVvcPSF1Xz2bXxwpvSyQKGXcs/DZmH2Yq6Qo5X6zS2xMotyjpkxZx6x CBBLyub/I93WCDLJkqQlz+qJKMDdR92ckWE9aeoZS0KU0JuiLO68+Z8tcNS1zd10Pw SXhtQGMI7Ad6ZHKdgaQ60mOoZNuf6k6cAqaMMnN4= Date: Wed, 13 Nov 2019 12:04:20 -0800 From: Eric Biggers To: Sami Tolvanen Cc: Herbert Xu , Ard Biesheuvel , Kees Cook , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] crypto: arm64/sha: fix function types Message-ID: <20191113200419.GE221701@gmail.com> Mail-Followup-To: Sami Tolvanen , Herbert Xu , Ard Biesheuvel , Kees Cook , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20191112223046.176097-1-samitolvanen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191112223046.176097-1-samitolvanen@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 12, 2019 at 02:30:46PM -0800, Sami Tolvanen wrote: > Declare assembly functions with the expected function type > instead of casting pointers in C to avoid type mismatch failures > with Control-Flow Integrity (CFI) checking. > > Signed-off-by: Sami Tolvanen > --- > arch/arm64/crypto/sha1-ce-glue.c | 12 +++++------- > arch/arm64/crypto/sha2-ce-glue.c | 26 +++++++++++--------------- > arch/arm64/crypto/sha256-glue.c | 30 ++++++++++++------------------ > arch/arm64/crypto/sha512-ce-glue.c | 23 ++++++++++------------- > arch/arm64/crypto/sha512-glue.c | 13 +++++-------- > 5 files changed, 43 insertions(+), 61 deletions(-) > > diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c > index bdc1b6d7aff7..3153a9bbb683 100644 > --- a/arch/arm64/crypto/sha1-ce-glue.c > +++ b/arch/arm64/crypto/sha1-ce-glue.c > @@ -25,7 +25,7 @@ struct sha1_ce_state { > u32 finalize; > }; > > -asmlinkage void sha1_ce_transform(struct sha1_ce_state *sst, u8 const *src, > +asmlinkage void sha1_ce_transform(struct sha1_state *sst, u8 const *src, > int blocks); Please update the comments in the corresponding assembly files too. Also, this change doesn't really make sense because the assembly functions still expect struct sha1_ce_state, and they access sha1_ce_state::finalize which is not present in struct sha1_state. There should either be wrapper functions that explicitly do the cast from sha1_state to sha1_ce_state, or there should be comments in the assembly files that very clearly explain that although the function prototype takes sha1_state, it's really assumed to be a sha1_ce_state. Likewise for SHA-256 and SHA-512. - Eric