Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux

[firefly-linux-kernel-4.4.55.git] / kernel / system_keyring.c

diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c
index 52ebc70263f4d8e806dc436fd55e6000cf818915..875f64e8935bbf1f27320a42ae467f170b09e3d9 100644 (file)
--- a/kernel/system_keyring.c
+++ b/kernel/system_keyring.c
@@ -89,6 +89,7 @@ static __init int load_system_certificate_list(void)
                        pr_err("Problem loading in-kernel X.509 certificate (%ld)\n",
                               PTR_ERR(key));
                } else {
+                       set_bit(KEY_FLAG_BUILTIN, &key_ref_to_ptr(key)->flags);
                        pr_notice("Loaded X.509 cert '%s'\n",
                                  key_ref_to_ptr(key)->description);
                        key_ref_put(key);