diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-24 07:36:19 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-24 07:36:19 -0400 |
| commit | 4ca332e11df42604e784bd7da9e483160636d05e (patch) | |
| tree | 82e6ba6dff978edc2132e751c19197de50218c7e /kernel | |
| parent | 6d6f3328422a3bc56b0d8dd026a5de845d2abfa7 (diff) | |
| parent | 633706a2ee81637be37b6bc02c5336950cc163b5 (diff) | |
Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'kernel')
| -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) | |||
| 89 | pr_err("Problem loading in-kernel X.509 certificate (%ld)\n", | 89 | pr_err("Problem loading in-kernel X.509 certificate (%ld)\n", |
| 90 | PTR_ERR(key)); | 90 | PTR_ERR(key)); |
| 91 | } else { | 91 | } else { |
| 92 | set_bit(KEY_FLAG_BUILTIN, &key_ref_to_ptr(key)->flags); | ||
| 92 | pr_notice("Loaded X.509 cert '%s'\n", | 93 | pr_notice("Loaded X.509 cert '%s'\n", |
| 93 | key_ref_to_ptr(key)->description); | 94 | key_ref_to_ptr(key)->description); |
| 94 | key_ref_put(key); | 95 | key_ref_put(key); |