diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
| commit | 3cb92fe48138d225b8d0ceedf148642f9103f841 (patch) | |
| tree | cbb877002d9d39777be13df3876e05f2542da234 /crypto | |
| parent | 5beb0c435bdde35a09376566b0e28f7df87c9f68 (diff) | |
| parent | 0112721df4edbdd07b800813300d76811572f080 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asymmetric_keys/x509_public_key.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c index 2a44b3752471..9e9e5a6a9ed6 100644 --- a/crypto/asymmetric_keys/x509_public_key.c +++ b/crypto/asymmetric_keys/x509_public_key.c @@ -321,6 +321,8 @@ static int x509_key_preparse(struct key_preparsed_payload *prep) goto error_free_cert; } else if (!prep->trusted) { ret = x509_validate_trust(cert, get_system_trusted_keyring()); + if (ret) + ret = x509_validate_trust(cert, get_ima_mok_keyring()); if (!ret) prep->trusted = 1; } |