* [PATCH] ipe: fallback to platform keyring also if key in trusted keyring is rejected
@ 2024-09-27 8:23 luca.boccassi
2024-09-27 17:50 ` Fan Wu
0 siblings, 1 reply; 2+ messages in thread
From: luca.boccassi @ 2024-09-27 8:23 UTC (permalink / raw)
To: linux-security-module; +Cc: wufan, paul, serge
From: Luca Boccassi <bluca@debian.org>
If enabled, we fallback to the platform keyring if the trusted keyring doesn't have
the key used to sign the roothash. But if pkcs7_verify() rejects the key for other
reasons, such as usage restrictions, we do not fallback. Do so, following the same
change in dm-verity.
Signed-off-by: Luca Boccassi <bluca@debian.org>
Suggested-by: Serge Hallyn <serge@hallyn.com>
---
The equivalent change in dm-verity was accepted, so apply it to IPE as well:
https://lore.kernel.org/all/63220688-ac55-e1fc-300d-c93a948801e3@redhat.com/
security/ipe/policy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/ipe/policy.c b/security/ipe/policy.c
index 45f7d6a0ed23..b628f696e32b 100644
--- a/security/ipe/policy.c
+++ b/security/ipe/policy.c
@@ -178,7 +178,7 @@ struct ipe_policy *ipe_new_policy(const char *text, size_t textlen,
VERIFYING_UNSPECIFIED_SIGNATURE,
set_pkcs7_data, new);
#ifdef CONFIG_IPE_POLICY_SIG_PLATFORM_KEYRING
- if (rc == -ENOKEY)
+ if (rc == -ENOKEY || rc == -EKEYREJECTED)
rc = verify_pkcs7_signature(NULL, 0, new->pkcs7, pkcs7len,
VERIFY_USE_PLATFORM_KEYRING,
VERIFYING_UNSPECIFIED_SIGNATURE,
--
2.39.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ipe: fallback to platform keyring also if key in trusted keyring is rejected
2024-09-27 8:23 [PATCH] ipe: fallback to platform keyring also if key in trusted keyring is rejected luca.boccassi
@ 2024-09-27 17:50 ` Fan Wu
0 siblings, 0 replies; 2+ messages in thread
From: Fan Wu @ 2024-09-27 17:50 UTC (permalink / raw)
To: luca.boccassi, linux-security-module; +Cc: paul, serge
On 9/27/2024 1:23 AM, luca.boccassi@gmail.com wrote:
> From: Luca Boccassi <bluca@debian.org>
>
> If enabled, we fallback to the platform keyring if the trusted keyring doesn't have
> the key used to sign the roothash. But if pkcs7_verify() rejects the key for other
> reasons, such as usage restrictions, we do not fallback. Do so, following the same
> change in dm-verity.
>
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> Suggested-by: Serge Hallyn <serge@hallyn.com>
> ---
> The equivalent change in dm-verity was accepted, so apply it to IPE as well:
> https://lore.kernel.org/all/63220688-ac55-e1fc-300d-c93a948801e3@redhat.com/
>
> security/ipe/policy.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/security/ipe/policy.c b/security/ipe/policy.c
> index 45f7d6a0ed23..b628f696e32b 100644
> --- a/security/ipe/policy.c
> +++ b/security/ipe/policy.c
> @@ -178,7 +178,7 @@ struct ipe_policy *ipe_new_policy(const char *text, size_t textlen,
> VERIFYING_UNSPECIFIED_SIGNATURE,
> set_pkcs7_data, new);
> #ifdef CONFIG_IPE_POLICY_SIG_PLATFORM_KEYRING
> - if (rc == -ENOKEY)
> + if (rc == -ENOKEY || rc == -EKEYREJECTED)
> rc = verify_pkcs7_signature(NULL, 0, new->pkcs7, pkcs7len,
> VERIFY_USE_PLATFORM_KEYRING,
> VERIFYING_UNSPECIFIED_SIGNATURE,
Acked-by: Fan Wu <wufan@linux.microsoft.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-27 17:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-27 8:23 [PATCH] ipe: fallback to platform keyring also if key in trusted keyring is rejected luca.boccassi
2024-09-27 17:50 ` Fan Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).