diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-05 13:21:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-05 13:21:30 -0800 |
| commit | 29cd507cbec282e13dcf8f38072a100af96b2bb7 (patch) | |
| tree | caa81f1e65dcb6c5d78c5b6e32d475162ff24e1f /security | |
| parent | 127ec4c0b2ac4821e8de17b9a3d0c0af883770d2 (diff) | |
| parent | 85445b96429057d87446bcb24ec0cac9ea9c7fdf (diff) | |
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
Diffstat (limited to 'security')
| -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); |