Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp7351441rwl; Fri, 30 Dec 2022 07:18:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXsYB8Ra0QJSEJQMy/H8Bl+nO93IE4PF36AWhR/Xaqm0ctbJxlTPhiD5wz0WUTfjA70K6qZ0 X-Received: by 2002:a17:906:a891:b0:7c1:4d35:a143 with SMTP id ha17-20020a170906a89100b007c14d35a143mr28349032ejb.3.1672413502463; Fri, 30 Dec 2022 07:18:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672413502; cv=none; d=google.com; s=arc-20160816; b=dDBkgdVk9hC04pK2v0vxYeTMIE98iEIsaNaL2FtnX5k+jWrSdat1C0DagxOpddZV8E CS/glJDRbvAOmgb1lhTraWZXtA4fKGAYbbInmg6m/tVD73ZpMb2iSyXtbhaKlZDMPiYj ZgE9LRv/QHisI+W4NY50UrmjSLbFz2ivPFZ6xT25ipfbJewfSsAb3mmcExus75RMYexu drruHdpTT7oWq6HGxs0TcmE+WcKCB3lT58kksYZgy/AzLENN5M38Z3wLMHIZ8ImKco71 hJIw0Ld+hBdT4tR5nqSSvYT4ppu+7D60Ckzf7vzNzVWuZNEjlKwB8xrHw3zhPU2DXavc zWUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=xNpu6Rn1gLTTKaYiVG0q3rswTtiiweDZCk1+xGFp2e8=; b=q0WBxNyCtHtcOu7nToA6Lqgh3OOsgLTQZjKYypsaTtXraZtoelTr6J+1b6HStLS1q6 WDVi72QAeRB/xlQchb1k5lKPGEltUHHhpauq7iMasX7E40fHRPdSQQIiHU5d4KUhF9ya OXXRGhqn1dXf/Khyv3xZRw82+6UriFLgQkovRVPWaF1I1ViffRMTDwk/31cbpFH+B1Oe FCg2oQTNJ3evOnkxMajWNaDXwOIRzSsBIQckGPIkWKvDQ9jXcVdjw5dnlbQ8bZTW5syE ccMLjhfLRlir5yvIDqn6jK6yrxSwHrvfp4i7yl6+22LM0ZAvRggmap6J981O+XJBtgCU mVhg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs36-20020a1709072d2400b0080f0493b9c8si19533686ejc.536.2022.12.30.07.17.57; Fri, 30 Dec 2022 07:18:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235135AbiL3PP4 (ORCPT + 99 others); Fri, 30 Dec 2022 10:15:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234825AbiL3PPz (ORCPT ); Fri, 30 Dec 2022 10:15:55 -0500 Received: from formenos.hmeau.com (helcar.hmeau.com [216.24.177.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE5C7140C3; Fri, 30 Dec 2022 07:15:54 -0800 (PST) Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1pBH6k-00COx8-JD; Fri, 30 Dec 2022 23:15:43 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 30 Dec 2022 23:15:42 +0800 Date: Fri, 30 Dec 2022 23:15:42 +0800 From: Herbert Xu To: Tianjia Zhang Cc: "David S. Miller" , Catalin Marinas , Will Deacon , Eric Biggers , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] crypto: arm64/sm4 - fix possible crash with CFI enabled Message-ID: References: <20221221073232.15110-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221221073232.15110-1-tianjia.zhang@linux.alibaba.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Wed, Dec 21, 2022 at 03:32:32PM +0800, Tianjia Zhang wrote: > The SM4 CCM/GCM assembly functions for encryption and decryption is > called via indirect function calls. Therefore they need to use > SYM_TYPED_FUNC_START instead of SYM_FUNC_START to cause its type hash > to be emitted when the kernel is built with CONFIG_CFI_CLANG=y. > Otherwise, the code crashes with a CFI failure (if the compiler didn't > happen to optimize out the indirect call). > > Fixes: 67fa3a7fdf80 ("crypto: arm64/sm4 - add CE implementation for CCM mode") > Fixes: ae1b83c7d572 ("crypto: arm64/sm4 - add CE implementation for GCM mode") > Signed-off-by: Tianjia Zhang > --- > arch/arm64/crypto/sm4-ce-ccm-core.S | 5 +++-- > arch/arm64/crypto/sm4-ce-gcm-core.S | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) Patch applied. Thanks. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt