diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-10-19 21:34:04 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-10-19 21:34:04 -0400 |
| commit | fbf98265891a672111dac8faabd190f62b678545 (patch) | |
| tree | 867454d82b11677372140b3700ade5f6e3dea55d | |
| parent | d72c39114c3f36785bb71aaf9dea642e59723abc (diff) | |
| parent | 72e1eed8abb11c79749266d433c817ce36732893 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
| -rw-r--r-- | security/integrity/digsig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index 36fb6b527829..5be9ffbe90ba 100644 --- 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) | |||
| 105 | rc, | 105 | rc, |
| 106 | ((KEY_POS_ALL & ~KEY_POS_SETATTR) | | 106 | ((KEY_POS_ALL & ~KEY_POS_SETATTR) | |
| 107 | KEY_USR_VIEW | KEY_USR_READ), | 107 | KEY_USR_VIEW | KEY_USR_READ), |
| 108 | KEY_ALLOC_NOT_IN_QUOTA | KEY_ALLOC_TRUSTED); | 108 | KEY_ALLOC_NOT_IN_QUOTA); |
| 109 | if (IS_ERR(key)) { | 109 | if (IS_ERR(key)) { |
| 110 | rc = PTR_ERR(key); | 110 | rc = PTR_ERR(key); |
| 111 | pr_err("Problem loading X.509 certificate (%d): %s\n", | 111 | pr_err("Problem loading X.509 certificate (%d): %s\n", |