Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…

…zohar/linux-integrity into next
mariux64 · Oct 20, 2015 · fbf9826 · fbf9826
2 parents d72c391 + 72e1eed
commit fbf9826
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
@@ -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",