Re: [PATCH] KEYS: trusted: Fix trusted key backends when building as module
From: Jarkko Sakkinen <jarkko@kernel.org>
Date: 2021-07-27 02:55:09
Also in:
keyrings, linux-integrity, lkml
On Fri, Jul 16, 2021 at 10:17:22AM +0200, Andreas Rammhold wrote:
Before this commit the kernel could end up with no trusted key sources even thought both of the currently supported backends (tpm & tee) were
Nit: "TPM and TEE" instead of "tpm & tee"
compoiled as modules. This manifested in the trusted key type not being registered at all.
Do you have a commit ID for the failing commit?
When checking if a CONFIG_… preprocessor variable is defined we only test for the builtin (=y) case and not the module (=m) case. By using the IS_ENABLE(…) macro we to test for both cases.
Nit: IS_ENABLED() (without dots inside, missing 'D').
quoted hunk ↗ jump to hunk
Signed-off-by: Andreas Rammhold <redacted> --- security/keys/trusted-keys/trusted_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c index d5c891d8d353..fd640614b168 100644 --- a/security/keys/trusted-keys/trusted_core.c +++ b/security/keys/trusted-keys/trusted_core.c@@ -27,10 +27,10 @@ module_param_named(source, trusted_key_source, charp, 0); MODULE_PARM_DESC(source, "Select trusted keys source (tpm or tee)"); static const struct trusted_key_source trusted_key_sources[] = { -#if defined(CONFIG_TCG_TPM) +#if IS_ENABLED(CONFIG_TCG_TPM) { "tpm", &trusted_key_tpm_ops }, #endif -#if defined(CONFIG_TEE) +#if IS_ENABLED(CONFIG_TEE) { "tee", &trusted_key_tee_ops }, #endif };-- 2.32.0
/Jarkko