From patchwork Mon Mar 1 16:11:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 388738 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3662287jap; Mon, 1 Mar 2021 12:15:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyCtCyLmgNzJLkNud+qSRy99Fc1AI3YQt7eirbV3ETarq2uH0kvxIse9qam6W260lw4j7Z X-Received: by 2002:a50:a086:: with SMTP id 6mr17721344edo.70.1614629757381; Mon, 01 Mar 2021 12:15:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614629757; cv=none; d=google.com; s=arc-20160816; b=MVaA0aq+T7RNidLte6447KpKystYBT+Vy8+TRuPSa5nPi4M1YlzMFLKx35v3qZbZ0W ON85EQCguLcto6AgSSf1+RL5QZynFPGHa7CFnvXnqrSB7/m8ptrGTK654d2MIOVlRWsv GMX4Z2toMF9fWpGULTk7u1dgoY2WGFLsGz6jCp/8zdmVs/nrDMFskFTtciJku9B07lZV c0xMDbXsMgy9kPRkL8sDS/5/MJu6GDzhFrgH1+A/p949sVuNmX5+SvwIjadKwcDfc9XH dFCJz4OSwR9urRUVYAH026k4m/2HeyTyTEkYNdouer1x3CLs9/XIJZrxLE5aReNVY1hK TFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/FciXbT1Q81WbpLOXcqNF1TtkIfWUb2kF0bHqf/jsNU=; b=gv7JOzAiAa+Yuf0WRtyjvnWpVebALqDN/HqSuY5KeTGFfmehzjBTxnxWrsWsZuR1dz LfO5Omp1isw1J3BoFSDXXR340IrhGzvdQYGikA2z+xXgxysarRzin4YGKi4PAmQ/4qnK sIWdq1yllooK+JJQ4V5R+f9JC0l27yx69RVXQq9oaPFxW437u6D47zGKhoy0D1FdOlzi 0GWFsROhrNdMrZh8wzCnlh4pcBiv3R+DrCXphwQZ5BKHAIQ9gKWnlRxyTNWbdBAqc5Fy D6cib7HiJ5siJq+vM+qToMIyuDYDtDbV4xLBdMHN74mIUtUJ8ANGXNj1gO1rqUmVveip 3cmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Po+U7gdF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g12si14730744edj.22.2021.03.01.12.15.57; Mon, 01 Mar 2021 12:15:57 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Po+U7gdF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238673AbhCAUO7 (ORCPT + 13 others); Mon, 1 Mar 2021 15:14:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:37640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234807AbhCAUFR (ORCPT ); Mon, 1 Mar 2021 15:05:17 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6B643651BB; Mon, 1 Mar 2021 17:58:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614621512; bh=daHe7MB+C30NkwnqJMLl56OTppxDx9DlOWTArauACdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Po+U7gdFQdB9AWeNv01CAzrKlWFlOvMgJ9JXsyaozwNAdK+KoNstzVNBWQmi/INks ODb4fYVQ9bu9Kg8olD1N/k61kE9HZVIGzRfy3mnO/NdsG7I1V8gvG/HlW08YV4bk6S AWTo9s3QBxrGA0P5KBJTsFMxyiNV8GO5s9Fpkzck= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Lipnitskiy , "Jason A. Donenfeld" , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.11 544/775] wireguard: kconfig: use arm chacha even with no neon Date: Mon, 1 Mar 2021 17:11:52 +0100 Message-Id: <20210301161228.367006864@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161201.679371205@linuxfoundation.org> References: <20210301161201.679371205@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason A. Donenfeld [ Upstream commit bce2473927af8de12ad131a743f55d69d358c0b9 ] The condition here was incorrect: a non-neon fallback implementation is available on arm32 when NEON is not supported. Reported-by: Ilya Lipnitskiy Fixes: e7096c131e51 ("net: WireGuard secure network tunnel") Signed-off-by: Jason A. Donenfeld Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 260f9f46668b8..63339d29be905 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -87,7 +87,7 @@ config WIREGUARD select CRYPTO_CURVE25519_X86 if X86 && 64BIT select ARM_CRYPTO if ARM select ARM64_CRYPTO if ARM64 - select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON + select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON) select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON select CRYPTO_POLY1305_ARM if ARM select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON