Skip to content

Commit 85445b9

Browse files
coibymimizohar
authored andcommitted
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: d199677 ("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>
1 parent 841c351 commit 85445b9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

security/integrity/digsig.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ static int __init integrity_add_key(const unsigned int id, const void *data,
179179
KEY_ALLOC_NOT_IN_QUOTA);
180180
if (IS_ERR(key)) {
181181
rc = PTR_ERR(key);
182-
pr_err("Problem loading X.509 certificate %d\n", rc);
182+
if (id != INTEGRITY_KEYRING_MACHINE)
183+
pr_err("Problem loading X.509 certificate %d\n", rc);
183184
} else {
184185
pr_notice("Loaded X.509 cert '%s'\n",
185186
key_ref_to_ptr(key)->description);

0 commit comments

Comments
 (0)