diff options
| author | David Howells <dhowells@redhat.com> | 2014-07-23 00:54:43 +0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-23 00:54:43 +0400 |
| commit | 64724cfc6eea920dbaada14f0fb978b1dd31192d (patch) | |
| tree | d2f491be07a05e2d96b5c8b8e5a0a878f285eb22 /kernel/system_keyring.c | |
| parent | 6204e0025566ad3992ce649d4f44b7e8cdde2293 (diff) | |
| parent | 7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778 (diff) | |
| download | linux-64724cfc6eea920dbaada14f0fb978b1dd31192d.tar.xz | |
Merge remote-tracking branch 'integrity/next-with-keys' into keys-next
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'kernel/system_keyring.c')
| -rw-r--r-- | kernel/system_keyring.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c index 52ebc70263f4..875f64e8935b 100644 --- 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); |