diff options
| author | Coiby Xu <coxu@redhat.com> | 2024-01-09 08:24:28 +0800 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.ibm.com> | 2024-02-16 08:04:17 -0500 |
| commit | 85445b96429057d87446bcb24ec0cac9ea9c7fdf (patch) | |
| tree | 58acbd48382d446d1525620232ade9fd57a2cd9b | |
| parent | 841c35169323cd833294798e58b9bf63fa4fa1de (diff) | |
| download | linux-85445b96429057d87446bcb24ec0cac9ea9c7fdf.tar.gz linux-85445b96429057d87446bcb24ec0cac9ea9c7fdf.tar.bz2 linux-85445b96429057d87446bcb24ec0cac9ea9c7fdf.zip | |
integrity: eliminate unnecessary "Problem loading X.509 certificate" msg
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@protonmail.com
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2239331
Fixes: d19967764ba8 ("integrity: Introduce a Linux keyring called machine")
Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
Signed-off-by: Coiby Xu <coxu@redhat.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
| -rw-r--r-- | security/integrity/digsig.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |