From patchwork Mon Mar 1 16:11:42 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: 388717 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3627691jap; Mon, 1 Mar 2021 11:23:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyJrUaGPo9vM1InFH49FV7N1qVij246WO6oLvpnHFKuN2MvVGavT7KxAtiw3t9usfRTZjz X-Received: by 2002:a17:906:d214:: with SMTP id w20mr17589147ejz.284.1614626610895; Mon, 01 Mar 2021 11:23:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614626610; cv=none; d=google.com; s=arc-20160816; b=uB3U3fXrzzQHIiCKBWKPHgQB996wxBSm2qNAbBnrRdCwFZ5nmEL+3OT9ZBLFOlaT0D sjzJQOCsZBzB9KtqjT9yg6smEViSOydpZhJQdkqHW4l8ZgeWMIFKQ0PkpaLZTW1Ys1X+ LDEdgMPT04QFxo0ATBs7LaPGBPrldwMJUsjwBP4O9uuhAaxH2wymKIeYGONDnRJfFugo HTEL0v/gTf7vD9E350iWgP4coczfhSYzxIzqyCxNCo/HU6+PI5N2X2NooRKHbqpXaHpg zASoz/aj69pXeBSeRhTo517T/CJiK6pGa6i3ejzYEKmb8uc2wDzV+XPtHbnlDQKbAUlx T8Pg== 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=QkjoQptubuzB8QX9q+kOoAeTMw+9KlZ0jEa7KG2jJo8=; b=FRxPIlqinMCGcHuUo40hnIwRVCrzk/Rl+BXEy7SOe7NMGtJAGRsX/aUoFmKCTBpS4K 8iMxAMRmX9wDH42UJ50tJC0cK14XbIwUcHMuWuiOcoQkPSCQr3M+pbQMlqmNr2ICq4WD i0gOWEKN/FuIb1ZibEHqtlcKeuQccMNuLD8sogQcb/JWsr4sM5EA4sLSJrPLOqR8wzEt tiVNe2QEllzNRezXFWDaucqZheaYAYiZLTsfK1SFksENIWq/dfopk2/fEa0AlAPXSMwH NLsb9TGPFzLsJnRmKgQ7hW/XRoMhbtjT1nshOlAa5ab3FGWAIYGsMnCN89rHmpKLrOmj n9Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jGa8qtMy; 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 r15si11591578ejj.134.2021.03.01.11.23.30; Mon, 01 Mar 2021 11:23:30 -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=jGa8qtMy; 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 S241440AbhCATWu (ORCPT + 13 others); Mon, 1 Mar 2021 14:22:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:43776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241328AbhCATRl (ORCPT ); Mon, 1 Mar 2021 14:17:41 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B51E65222; Mon, 1 Mar 2021 17:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614619441; bh=tG5n0v8kSpXoRba8KdZn1CKcy/6jB4QU66qD7/qMDGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jGa8qtMyxGM69pLQ8ljqWulISi5jyzh91DgtEwMw241gXNShuw9HbD3Th+l5S+zLO rqYsiQ/INyeIrAFl87ucSeUMMEClD9Jrli5R95stlRIknLejcAc0HQj7n9YR4fZPtr yX17KxAgtaM1LDX6BPUXLlWqYOhI2TblkbMgp3+Y= 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.10 454/663] wireguard: kconfig: use arm chacha even with no neon Date: Mon, 1 Mar 2021 17:11:42 +0100 Message-Id: <20210301161204.353584836@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@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 c3dbe64e628ea..13e0a8caf3b6f 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