[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230414080329.76176-1-arnd@kernel.org>
Date: Fri, 14 Apr 2023 10:03:07 +0200
From: Arnd Bergmann <arnd@...nel.org>
To: Luis Chamberlain <mcgrof@...nel.org>,
Russ Weight <russell.h.weight@...el.com>
Cc: linux-crypto@...r.kernel.org,
Herbert Xu <herbert@...dor.apana.org.au>,
Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J. Wysocki" <rafael@...nel.org>,
Tianfei zhang <tianfei.zhang@...el.com>,
Cezary Rojewski <cezary.rojewski@...el.com>,
Amadeusz Sławiński
<amadeuszx.slawinski@...ux.intel.com>,
Takashi Iwai <tiwai@...e.de>, linux-kernel@...r.kernel.org
Subject: [PATCH] firmware_loader: rework crypto dependencies
From: Arnd Bergmann <arnd@...db.de>
The crypto dependencies for the firmwware loader are incomplete,
in particular a built-in FW_LOADER fails to link against a modular
crypto hash driver:
ld.lld: error: undefined symbol: crypto_alloc_shash
ld.lld: error: undefined symbol: crypto_shash_digest
ld.lld: error: undefined symbol: crypto_destroy_tfm
>>> referenced by main.c
>>> drivers/base/firmware_loader/main.o:(fw_log_firmware_info) in archive vmlinux.a
Rework this to use the usual 'select' from the driver module,
to respect the built-in vs module dependencies, and add a
more verbose crypto dependency to the debug option to prevent
configurations that lead to a link failure.
Fixes: 02fe26f25325 ("firmware_loader: Add debug message with checksum for FW file")
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
Tested on a few hundred randconfig builds
---
drivers/base/firmware_loader/Kconfig | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/base/firmware_loader/Kconfig b/drivers/base/firmware_loader/Kconfig
index 0cabc783d67a..5ca00e02fe82 100644
--- a/drivers/base/firmware_loader/Kconfig
+++ b/drivers/base/firmware_loader/Kconfig
@@ -3,6 +3,8 @@ menu "Firmware loader"
config FW_LOADER
tristate "Firmware loading facility" if EXPERT
+ select CRYPTO_HASH if FW_LOADER_DEBUG
+ select CRYPTO_SHA256 if FW_LOADER_DEBUG
default y
help
This enables the firmware loading facility in the kernel. The kernel
@@ -26,10 +28,9 @@ config FW_LOADER
config FW_LOADER_DEBUG
bool "Log filenames and checksums for loaded firmware"
+ depends on CRYPTO = FW_LOADER || CRYPTO=y
depends on DYNAMIC_DEBUG
depends on FW_LOADER
- depends on CRYPTO
- depends on CRYPTO_SHA256
default FW_LOADER
help
Select this option to use dynamic debug to log firmware filenames and
--
2.39.2
Powered by blists - more mailing lists