Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-drm-fsl-dcu.git] / crypto / asymmetric_keys / x509_public_key.c

diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
index 2a44b3752471d0b34d19fbe4a66305863dfcafb8..9e9e5a6a9ed63a156ddf5a58b726cadc00ef1e3a 100644 (file)
--- 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;
        }