Merge 4.14.69 into android-4.14-p

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / certs / system_keyring.c

diff --git a/certs/system_keyring.c b/certs/system_keyring.c
index 0e1ea235c12a31363234964bac2482d4836a4928..4ba922ff3db6ba0c78ba040bc63a665da00af28f 100644 (file)
--- a/certs/system_keyring.c
+++ b/certs/system_keyring.c
@@ -15,6 +15,7 @@
 #include <linux/cred.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/verification.h>
 #include <keys/asymmetric-type.h>
 #include <keys/system_keyring.h>
 #include <crypto/pkcs7.h>
@@ -230,7 +231,7 @@ int verify_pkcs7_signature(const void *data, size_t len,
 
        if (!trusted_keys) {
                trusted_keys = builtin_trusted_keys;
-       } else if (trusted_keys == (void *)1UL) {
+       } else if (trusted_keys == VERIFY_USE_SECONDARY_KEYRING) {
 #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
                trusted_keys = secondary_trusted_keys;
 #else