From patchwork Mon Dec 28 12:41:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352706 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9822989jai; Mon, 28 Dec 2020 07:18:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaUmrjh1yLArIGpCBInbSJabpgHLOC0Jnac8ZG7b6Q03DLibRPiqC4L5Hl51XySlfoHFgZ X-Received: by 2002:a17:907:a8a:: with SMTP id by10mr41343906ejc.423.1609168683338; Mon, 28 Dec 2020 07:18:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609168683; cv=none; d=google.com; s=arc-20160816; b=FIvNq5ywn4SFVRxBvSd+7Z6/z1GW7fWMGJE5BDlv8y5ZHSYE8B1vmMwLgerqzN3Mru sr3Jvmpr9WYMNgl2cy+zZlExL1jtmMw+IazSCwSvFbCkn9tiDlS9aYegs1PMm8BewhFR kDEs0fyUz11f3K5/kJUi1Et9t9dJHLUh6h9qF5DyV26eSUQnk1934JT7TQKca87rnjzX 5/Qu8UYtkPGNHz7tmVGFRnkonRNDvZjmVZnoKUsRcTgDCyLl48OP2B+y+vYT/eSYAmOr eGxytH0QfTTqf87Aux1vOBepIkI5fqWCSF1pyM+ILU425EHhQUuqKj9WrzQdgOY1HYkn rOJw== 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=ukyp7hfMxBrzD3Kqt3O8vFoGl0So2JRlRQOJFQeh2Dk=; b=JhfIp8zpmm29uy5fvmWHCKAojq873pLeipY9xWKRXsuRWkcPjBL22J/dAtBtED3mpq k5IzvXKRRu4tcXY7eSzMeoWDsF58dcUNYGww+b2aJ2JKHD9YTuJSwr4YKU1nk25UDI1l 9segrTGZQPULkB/numqRe6tLkAi+P4V41xtDcBQMsjeh414Q3NGkMXPaWNAXDbUYdk/c 3/T/Ne8+IM+pSNHnclBcsrAqWtX4u4Z18BGXXy7I1dE0VxriyJeD4cpcHym3cVqrl5R0 Bfi/r19AR9w2XUqFRyouqC4TOkU4ceKoqSo+SGprbGbW2gVz28yVgsPcUJFHzayvt/Jf Bpgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YbNMd+4x; 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 by27si18956098edb.276.2020.12.28.07.18.03; Mon, 28 Dec 2020 07:18:03 -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=YbNMd+4x; 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 S2437393AbgL1OEf (ORCPT + 14 others); Mon, 28 Dec 2020 09:04:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:38836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437380AbgL1OEe (ORCPT ); Mon, 28 Dec 2020 09:04:34 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id AC668207CC; Mon, 28 Dec 2020 14:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164234; bh=y7iakMPtbfVP2HoO/fYnalgpMO7wdd/HzF17UrpbBEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YbNMd+4xAF6/nhGRaP8xfHpprwK9F/Eov0XwRjsgoaYqYTkDu3pKO3gb0HowTifrD 93bX3anSQgyKOV09KNQOMtCf5ZkjFm/3R4iPmPlrW/p6x8PBK6tz0iVRHAsYdzaWR+ LjbBpIlOrS4heVGBNxYpJxku154znojE7JgXkd4s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , Herbert Xu , Sasha Levin Subject: [PATCH 5.10 107/717] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager Date: Mon, 28 Dec 2020 13:41:45 +0100 Message-Id: <20201228125026.082236817@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@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 6569e3097f1c4a490bdf2b23d326855e04942dfd ] The extra tests in the manager actually require the manager to be selected too. Otherwise the linker gives errors like: ld: arch/x86/crypto/chacha_glue.o: in function `chacha_simd_stream_xor': chacha_glue.c:(.text+0x422): undefined reference to `crypto_simd_disabled_for_test' Fixes: 2343d1529aff ("crypto: Kconfig - allow tests to be disabled when manager is disabled") Signed-off-by: Jason A. Donenfeld Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/crypto/Kconfig b/crypto/Kconfig index 094ef56ab7b42..37de7d006858d 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS config CRYPTO_MANAGER_EXTRA_TESTS bool "Enable extra run-time crypto self tests" - depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS + depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER help Enable extra run-time self tests of registered crypto algorithms, including randomized fuzz tests.