Commit 29cd507c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'integrity-v6.8-fix' of...

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
parents 127ec4c0 85445b96
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ 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);
		if (id != INTEGRITY_KEYRING_MACHINE)
			pr_err("Problem loading X.509 certificate %d\n", rc);
	} else {
		pr_notice("Loaded X.509 cert '%s'\n",