[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <CY54Q6U6UMKM.2H5N3BACDBGU0@suppilovahvero>
Date: Wed, 03 Jan 2024 16:09:29 +0200
From: "Jarkko Sakkinen" <jarkko@...nel.org>
To: "Coiby Xu" <coxu@...hat.com>, <linux-integrity@...r.kernel.org>
Cc: <itrymybest80@...tonmail.com>, "Mimi Zohar" <zohar@...ux.ibm.com>,
"Dmitry Kasatkin" <dmitry.kasatkin@...il.com>, "Paul Moore"
<paul@...l-moore.com>, "James Morris" <jmorris@...ei.org>, "Serge E.
Hallyn" <serge@...lyn.com>, "open list:SECURITY SUBSYSTEM"
<linux-security-module@...r.kernel.org>, "open list"
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] integrity: don't throw an error immediately when failed
to add a cert to the .machine keyring
On Wed Dec 27, 2023 at 6:41 AM EET, Coiby Xu wrote:
> Currently when the kernel fails to add a cert to the .machine keyring,
> it will throw an error immediately in the function integrity_add_key.
>
> Since the kernel will try adding to the .platform keyring next or throw
> an error (in the caller of integrity_add_key i.e. add_to_machine_keyring),
> so there is no need to throw an error immediately in integrity_add_key.
>
> Reported-by: itrymybest80@...tonmail.com
Missing "Firstname Lastname".
> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2239331
> Signed-off-by: Coiby Xu <coxu@...hat.com>
> ---
> security/integrity/digsig.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
> index df387de29bfa..45c3e5dda355 100644
> --- a/security/integrity/digsig.c
> +++ b/security/integrity/digsig.c
> @@ -179,7 +179,8 @@ static int __init integrity_add_key(const unsigned int id, const void *data,
> KEY_ALLOC_NOT_IN_QUOTA);
> if (IS_ERR(key)) {
> rc = PTR_ERR(key);
> - pr_err("Problem loading X.509 certificate %d\n", rc);
> + if (id != INTEGRITY_KEYRING_MACHINE)
> + pr_err("Problem loading X.509 certificate %d\n", rc);
> } else {
> pr_notice("Loaded X.509 cert '%s'\n",
> key_ref_to_ptr(key)->description);
BR, Jarkko
Powered by blists - more mailing lists