From patchwork Tue Dec 20 05:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 13077513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ADC9C4332F for ; Tue, 20 Dec 2022 05:42:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 81AD48E0005; Tue, 20 Dec 2022 00:42:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CA8F8E0001; Tue, 20 Dec 2022 00:42:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66AE78E0005; Tue, 20 Dec 2022 00:42:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4ED1E8E0001 for ; Tue, 20 Dec 2022 00:42:03 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 626E81C635D for ; Tue, 20 Dec 2022 05:42:02 +0000 (UTC) X-FDA: 80261588484.16.8621C20 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf12.hostedemail.com (Postfix) with ESMTP id CB19740002 for ; Tue, 20 Dec 2022 05:42:00 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IvUk8ADq; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf12.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671514921; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=j4bxzdAiF9gK3vn6VN8DUzGdwXvIyPjsQRBc11VRhU0=; b=59IFu1T4KN/RDcobniiCLr+S7eFtouxQCdh8tc3ZYid3PA/FMdhkpcdCxf0uFL1aLgfG/K qu6v7q3RCdNw0+WlKf4f25HLkjLxxz3q1kfg9hpzqoSuVb87fWSxT79M6H2dt0xe0c7NEE 4C/CsKW5+R6ICEOibQrjC4y0R+SJL5A= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IvUk8ADq; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf12.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671514921; a=rsa-sha256; cv=none; b=IpREG98VNy4+aBXX8flzBpKZZMHJj0nOqwfKeq5XpL5tffmVuk1w8mf9lJw+sQGCq6giGh yabcYXpUlaDtX2dfY33SyJxohvLX2neCjLAwTim//OxOLcl0OZ9q0yKF8jQ8kBFO19zJYP tbziE8eFTj3pe6jWfpPGZy/8RFS5POI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D78A2B81196; Tue, 20 Dec 2022 05:41:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F4F8C43398; Tue, 20 Dec 2022 05:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671514917; bh=3n9ADRO4nwA4vng1EWokN1HkHn+cKE/ZleCXkk6FZuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IvUk8ADqzbVfp/roQjX87ypPf+5oAlzPl/WmfbZwTC7hJGifzKIvrISekXo1QbPwj 77veN4ECatl/Cp4R0djvSgbZtgQ55keX8ZIkZI6jwUwT7Rr+rlabmPl5waJUVMEYj6 XyAo0xmS282IUjrk6asDmm9DdzzAFQgTRU4HxJjUaPmxA1hb+Iu5q+ddQU8JBD6mm3 pmfhJ238h55NLqoCVkky8COjAQAbUY+kKd3+uo5qVrJratiTxIXlJhqeLW1lo+OA7M 9buDvhj1+x2uw3hIpNFy1RbrfxJv0tFYb3c95M8thLEx4T6NY9TZm8pqO+xvypQF+X XOzOZKCnjxGzQ== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: Peter Zijlstra , corbet@lwn.net, will@kernel.org, boqun.feng@gmail.com, mark.rutland@arm.com, catalin.marinas@arm.com, dennis@kernel.org, tj@kernel.org, cl@linux.com, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, Herbert Xu , davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, joro@8bytes.org, suravee.suthikulpanit@amd.com, robin.murphy@arm.com, dwmw2@infradead.org, baolu.lu@linux.intel.com, Arnd Bergmann , penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, Andrew Morton , vbabka@suse.cz, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-s390@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org Subject: [PATCH 1/3] crypto: x86/ghash - fix unaligned access in ghash_setkey() Date: Mon, 19 Dec 2022 21:40:40 -0800 Message-Id: <20221220054042.188537-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221220054042.188537-1-ebiggers@kernel.org> References: <20221220054042.188537-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CB19740002 X-Stat-Signature: i7yk7u1x6px6fbytwdo7ejqnn6s1qx8m X-HE-Tag: 1671514920-454958 X-HE-Meta: U2FsdGVkX19nTnURlhsKQrFrIvgzmFzkk4VahlB17/9Rk4lOoNm0kuVxcRUilORJFgOYrkLRffvtqRgYBsRJQaq7Lq09/zhTye8U64ZsANmFbSCityz28UUw1e1j852rZGfBUf0YLLj6l5AGZzUv6qTeR1m06gv/71aTDUX2jZM2Ifv7RHe65WYib0n/+BoynEjAI8gL4b8FYQTEPIpb29760HgB4Gjmsahzz9FiygmVJYMtqq70dUQNzzEYQh28SbU8niCtvOEQMW6ACYnHcwODT/E7n5Y/r8txhE6eOcVbtlMEy1x1eSBXk6Tr4YhnIyVFtLE+eOGB+ud8aBedsikT/ngla9OUFS44lNGrdbIxGKIsBmiUwS9ddoGBFqXERG4h83u5ksfxGodpI/JwsWciXk0xnk6shlpHPXHD8GNgai3FiHyzyoRHqYjMuj01zGWHGqDtAreOab8+WrJAzJ70Cq1BGRMpXx0nTQ21t1a9ep+Ji8tk0ool3L2+QsABJcbCOaYL2dcN96K14c5aAEa8sLRkgw7BKSN1CUJSQQdbiqEqSVczuznmUIPuFXXQ4Zha4zEJOU6m5SJnQxxT8fnUxwRuri9UBTUcJ41ueRK9S8JtopNay8inphnWa/1Hbzt/EPCeiqdnwo3a7QJCunV3X3uPW0GD9XJcede1X/Mr+RcsrSEoQjxBpv0awKzCXjHIkhFTjeeGCp3V/gGZ+s7QbLYirhbTNpZRYhoYrRXOHMR/Gof8RhAMcMMxC4BFcar7dlEg03JGIu76eb1Cp2xsJUyidFm6/NLCc1AbPgeH+BNdwPnrO0z49jJEXktG61Hohg4sv4qQ3/3ulQLoXePpPbTErLf4m22Ulim/9UmQSD+US0R52yv1294OY4QEgbrHEj7vGaZsV17785bu/+xoHJOKazmi/8xWJLefNzbXAC/Fqw5DSbe955FDCxneWpgq/FEqNW2XO7L2yDo zAS4/O5P xg4Q/b+FkyMVJIKP1i2WGiXdElN5sjEImTDxifTWSpvOQIRkL11saP12YIntwopWsBgldmF/cvcGmcMWsBhNTBPY6UOKqjRsw2luHQT3fTHfCzg3VMlRuaC9vJqx4siG5oriEwXeudTyrUObQAAw4SZjgBz2zM9iwx/6Hqv55pYWaxBPn5ZB91E5NscsWH83QAW4e X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Eric Biggers The key can be unaligned, so use the unaligned memory access helpers. Fixes: 8ceee72808d1 ("crypto: ghash-clmulni-intel - use C implementation for setkey()") Signed-off-by: Eric Biggers --- arch/x86/crypto/ghash-clmulni-intel_glue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c index 1f1a95f3dd0c..c0ab0ff4af65 100644 --- a/arch/x86/crypto/ghash-clmulni-intel_glue.c +++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c @@ -19,6 +19,7 @@ #include #include #include +#include #define GHASH_BLOCK_SIZE 16 #define GHASH_DIGEST_SIZE 16 @@ -54,15 +55,14 @@ static int ghash_setkey(struct crypto_shash *tfm, const u8 *key, unsigned int keylen) { struct ghash_ctx *ctx = crypto_shash_ctx(tfm); - be128 *x = (be128 *)key; u64 a, b; if (keylen != GHASH_BLOCK_SIZE) return -EINVAL; /* perform multiplication by 'x' in GF(2^128) */ - a = be64_to_cpu(x->a); - b = be64_to_cpu(x->b); + a = get_unaligned_be64(key); + b = get_unaligned_be64(key + 8); ctx->shash.a = (b << 1) | (a >> 63); ctx->shash.b = (a << 1) | (b >> 63);