Commit fbf98265 authored by James Morris's avatar James Morris
Browse files

Merge branch 'next' of... 

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
parents d72c3911 72e1eed8

security/integrity/digsig.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int __init integrity_load_x509(const unsigned int id, const char *path) 
				   rc,

				   ((KEY_POS_ALL & ~KEY_POS_SETATTR) |

				    KEY_USR_VIEW | KEY_USR_READ),

				   KEY_ALLOC_NOT_IN_QUOTA | KEY_ALLOC_TRUSTED);

				   KEY_ALLOC_NOT_IN_QUOTA);

	if (IS_ERR(key)) {

		rc = PTR_ERR(key);

		pr_err("Problem loading X.509 certificate (%d): %s\n",