From: andreas@rammhold.de
To: James Bottomley <jejb@linux.ibm.com>,
Jarkko Sakkinen <jarkko@kernel.org>,
Mimi Zohar <zohar@linux.ibm.com>,
David Howells <dhowells@redhat.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Sumit Garg <sumit.garg@linaro.org>
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>,
Andreas Rammhold <andreas@rammhold.de>,
linux-integrity@vger.kernel.org, keyrings@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH RESEND] KEYS: trusted: Fix trusted key backends when building as module
Date: Mon, 1 Nov 2021 19:41:14 +0100 [thread overview]
Message-ID: <20211101184115.1468041-1-andreas@rammhold.de> (raw)
From: Andreas Rammhold <andreas@rammhold.de>
Before this commit the kernel could end up with no trusted key sources
even though both of the currently supported backends (TPM and TEE) were
compiled as modules. This manifested in the trusted key type not being
registered at all.
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_REACHABLE() macro we do test for both cases.
Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework")
Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
---
This is a resend becuase of this unfortunate timeline:
- 2021-05-09: Regression hits mainline with v5.13-rc1
- 2021-07-16: Issue reported. v1 of this patch sent out
- 2021-07-21: Ahmad sends out alternative patch to fix issue
- 2021-07-27: Jarkko (Maintainer) NACKs Ahmad's patch because of scope
- 2021-07-29: v2 with fixes sent out
- 2021-07-29: Jarkko gives his Reviewed-by and requests one more v3
- 2021-07-31: v3 sent out
- 2021-09-13: Pinged, no feedback
- 2021-09-27: Pinged, Mimi (Maintainer) comments due to to misunderstanding.
Question about why this is not merged ignored
- 2021-10-11: Pinged, no feedback
v3:
* Fixed patch formatting
v2:
* Fixed commit message
* Switched from IS_DEFINED() to IS_REACHABLE()
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 d5c891d8d3534..5b35f1b876441 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_REACHABLE(CONFIG_TCG_TPM)
{ "tpm", &trusted_key_tpm_ops },
#endif
-#if defined(CONFIG_TEE)
+#if IS_REACHABLE(CONFIG_TEE)
{ "tee", &trusted_key_tee_ops },
#endif
};
--
2.33.0
next reply other threads:[~2021-11-01 18:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 18:41 andreas [this message]
2021-11-01 18:52 ` [PATCH RESEND] KEYS: trusted: Fix trusted key backends when building as module Ahmad Fatoum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211101184115.1468041-1-andreas@rammhold.de \
--to=andreas@rammhold.de \
--cc=a.fatoum@pengutronix.de \
--cc=dhowells@redhat.com \
--cc=jarkko@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=jmorris@namei.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=sumit.garg@linaro.org \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.