lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Morris
2015-10-20 12:34:04 +11:00
parent d72c39114c 72e1eed8ab
commit fbf9826589
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/integrity/digsig.c
View File

@@ -105,7 +105,7 @@ int __init integrity_load_x509(const unsigned int id, const char *path)
rc, rc,
((KEY_POS_ALL & ~KEY_POS_SETATTR) | ((KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ), KEY_USR_VIEW | KEY_USR_READ),
KEY_ALLOC_NOT_IN_QUOTA | KEY_ALLOC_TRUSTED); KEY_ALLOC_NOT_IN_QUOTA);
if (IS_ERR(key)) { if (IS_ERR(key)) {
rc = PTR_ERR(key); rc = PTR_ERR(key);
pr_err("Problem loading X.509 certificate (%d): %s\n", pr_err("Problem loading X.509 certificate (%d): %s\n",