projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
system_keyring.c
diff --git
a/kernel/system_keyring.c
b/kernel/system_keyring.c
index 564dd93430a276b0ac7db03a59cbb5648a639c93..52ebc70263f4d8e806dc436fd55e6000cf818915 100644
(file)
--- a/
kernel/system_keyring.c
+++ b/
kernel/system_keyring.c
@@
-22,7
+22,7
@@
struct key *system_trusted_keyring;
EXPORT_SYMBOL_GPL(system_trusted_keyring);
extern __initconst const u8 system_certificate_list[];
EXPORT_SYMBOL_GPL(system_trusted_keyring);
extern __initconst const u8 system_certificate_list[];
-extern __initconst const u
8 system_certificate_list_end[]
;
+extern __initconst const u
nsigned long system_certificate_list_size
;
/*
* Load the compiled-in keys
/*
* Load the compiled-in keys
@@
-60,8
+60,8
@@
static __init int load_system_certificate_list(void)
pr_notice("Loading compiled-in X.509 certificates\n");
pr_notice("Loading compiled-in X.509 certificates\n");
- end = system_certificate_list_end;
p = system_certificate_list;
p = system_certificate_list;
+ end = p + system_certificate_list_size;
while (p < end) {
/* Each cert begins with an ASN.1 SEQUENCE tag and must be more
* than 256 bytes in size.
while (p < end) {
/* Each cert begins with an ASN.1 SEQUENCE tag and must be more
* than 256 bytes in size.