Skip to content

Commit 29cd507

Browse files
committed
Merge tag 'integrity-v6.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity fix from Mimi Zohar: "A single fix to eliminate an unnecessary message" * tag 'integrity-v6.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity: integrity: eliminate unnecessary "Problem loading X.509 certificate" msg
2 parents 127ec4c + 85445b9 commit 29cd507

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

security/integrity/digsig.c

+2-1
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)