From patchwork Tue Aug 7 21:18:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 143596 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp54940ljj; Tue, 7 Aug 2018 14:18:43 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwE7G0qvvpULy8QFw6Y+Gq3jJH6FCuBd7jsbTZgfRebIqShvRdkC0Y8W5f78Nb8z4mYi1Ht X-Received: by 2002:a63:4703:: with SMTP id u3-v6mr52773pga.405.1533676723633; Tue, 07 Aug 2018 14:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533676723; cv=none; d=google.com; s=arc-20160816; b=QVsL2vA9j8GdnrOcnp58Vzl0tLeG1/K9OZSdxDKHnwtNyYmMPmEB4TWFnzdFM9I9bU foONaIxbV1GL4KT+mGvAdjzmCKQ1zeryu6rSqYX7RyuL7xekuH8NOp93DF0rCe6O5+WJ nh5lw9ydKCODOQMwxIW1fj5ECAkqDwN20LqF459/xo1VK8YT+2ip6zXiV7Gu/tEsq758 CR1tb1+hFudGKXdsnxmz1SQsHeKr11/vaZH1dsim2lcFazBSSMuubavUJkvXjhIbVCZo yk45LNcivWt/a+au7NsOnBiEN8VeCtI8cVDssU+CyUoSO4DPGo1HdUHRId7NZ7rkvb/9 TcJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=vzgLFq91yHGGujgj15OKqco7J+iWGXLuqBP2jim9Ro4=; b=kjDm3uEVf7oXvzYc1mfrreY8mjrdmyLdQDF0Ja70iGg00hwpTEv5YGS0O1Val7yWgE qaP7zZilKipdKcAW3k6QM+p9xVOElx8RKM/85SzE+Im5nkNyGrmaVg314hLBZygkuIk1 t5byuuJkb053GxAZppTHlZgq3uCXEWGCF06/rrNvvjhtUllSQprarsOuhXqrdsGrIbfx zsbUeSN207+TpIKIy5CDUCvj0LWg5V5KjAjBy/KDX8gxaAQv9bJW3XE+bt7yes1AIJAE 86TuXeh3gZUEpQaXb+Usadxo/bdZ0pT9NaBjTtAiyQlw+lvryYgEns5sSN4lZnTtx1+0 KTBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gSfMqS3E; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bh12-v6si1814174plb.425.2018.08.07.14.18.43; Tue, 07 Aug 2018 14:18:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gSfMqS3E; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726521AbeHGXfA (ORCPT + 2 others); Tue, 7 Aug 2018 19:35:00 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:44468 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726414AbeHGXfA (ORCPT ); Tue, 7 Aug 2018 19:35:00 -0400 Received: by mail-ed1-f67.google.com with SMTP id f23-v6so246706edr.11 for ; Tue, 07 Aug 2018 14:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=vzgLFq91yHGGujgj15OKqco7J+iWGXLuqBP2jim9Ro4=; b=gSfMqS3EumokkmKcv2vLwWt52RdW9P1xCyUL3c1H6oDn4nrPgvximsrf5l1EEjsEXD Knrid82lGYFYTw0ifHxd74F9048nXbrel1hedcpCj7ArUopka8QY6Zx62DCRI/6i9If2 SZzRYv3G7Vzaj0iuhgQGKvzrX/1Zi0q6THdWI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vzgLFq91yHGGujgj15OKqco7J+iWGXLuqBP2jim9Ro4=; b=q4x300N2KrY4nFrfifWU4cIlkf2W6Q3GMiSsyUhomTc5YKNoECuqkekzHm0Ht6eG+C 2eLfBzgmUjWZuLL4ldzPdosRRZKJF0tvZ6KR9saaV+Nojo0oK7f3Dk71YJG8tJYP3RLc Och4xid5JRwPPmrd/PvNnv3HaUULhTBRtlJjN5GMKOF1RPrTks2t7dFzFRuTtSNUeldZ Rg888+4Qc8uq5T+IX8krRSyGnTVxnVpPvE1MpkX/0T9xhQablGBnwXBe7rk7I40OPi4I IlBgVrfRTgXMgBkQvt7hKuabRUDlHJ8RrDd7F/g1sbscBtp+6oV2vhyEzlj25192f/pQ +Z7A== X-Gm-Message-State: AOUpUlFq+ievA0pdWE46iwOWUN4XuHSjjLMQYyrmTcKxF8zE4tsm35Lc FDX0KtErPkCEzrKTL6TRf9ykzgi/MO8= X-Received: by 2002:a50:ed09:: with SMTP id j9-v6mr108504eds.28.1533676720158; Tue, 07 Aug 2018 14:18:40 -0700 (PDT) Received: from rev02.home (b80182.upc-b.chello.nl. [212.83.80.182]) by smtp.gmail.com with ESMTPSA id g14-v6sm1015891edm.25.2018.08.07.14.18.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Aug 2018 14:18:39 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel Subject: [PATCH] crypto: arm64/sm4-ce - check for the right CPU feature bit Date: Tue, 7 Aug 2018 23:18:36 +0200 Message-Id: <20180807211836.9899-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org ARMv8.2 specifies special instructions for the SM3 cryptographic hash and the SM4 symmetric cipher. While it is unlikely that a core would implement one and not the other, we should only use SM4 instructions if the SM4 CPU feature bit is set, and we currently check the SM3 feature bit instead. So fix that. Signed-off-by: Ard Biesheuvel --- It would be good to get this backported to -stable but there is no need to merge this as a fix at -rc8 arch/arm64/crypto/sm4-ce-glue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 diff --git a/arch/arm64/crypto/sm4-ce-glue.c b/arch/arm64/crypto/sm4-ce-glue.c index b7fb5274b250..0c4fc223f225 100644 --- a/arch/arm64/crypto/sm4-ce-glue.c +++ b/arch/arm64/crypto/sm4-ce-glue.c @@ -69,5 +69,5 @@ static void __exit sm4_ce_mod_fini(void) crypto_unregister_alg(&sm4_ce_alg); } -module_cpu_feature_match(SM3, sm4_ce_mod_init); +module_cpu_feature_match(SM4, sm4_ce_mod_init); module_exit(sm4_ce_mod_fini);