integrity: support including firmware ".platform" keys at build time
Subsystems (8)
v12 cover integrity: support including firmware ".platform" keys at build time
Some firmware support secure boot by embedding static keys to verify the Linux kernel during boot. However, these firmware do not expose an interface for the kernel to load firmware keys onto the ".platform" keyring, preventing the kernel from verifying the kexec kernel image signature.
This patchset exports load_certificate_list() and defines a new function load_builtin_platform_cert() to load compiled in certificates onto the ".platform" keyring.
Changelog:
v12:
* Replace Patch 3/4 with reverting of the commit as suggested by Masahiro Yamada.
v11:
* Added a new patch to conditionally build extract-cert if PLATFORM_KEYRING is enabled.
v10:
* Fixed the externs warning for Patch 3.
v9:
* Rebased on Jarkko's repo -git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git
v8:
* Includes Jarkko's feedback on patch description and removed Reported-by for Patch 1.
v7:
* Incldues Jarkko's feedback on patch description for Patch 1 and 3.
v6:
* Includes Jarkko's feedback:
* Split Patch 2 into two.
* Update Patch description.
v5:
* Renamed load_builtin_platform_cert() to load_platform_certificate_list() and config INTEGRITY_PLATFORM_BUILTIN_KEYS to INTEGRITY_PLATFORM_KEYS, as suggested by Mimi Zohar.
v4:
* Split into two patches as per Mimi Zohar and Dimitri John Ledkov recommendation.
v3:
* Included Jarkko's feedback
** updated patch description to include approach.
** removed extern for function declaration in the .h file.
* Included load_certificate_list() within #ifdef CONFIG_KEYS condition.
v2:
* Fixed the error reported by kernel test robot
* Updated patch description based on Jarkko's feedback.
Nayna Jain (4):
certs: export load_certificate_list() to be used outside certs/
integrity: make integrity_keyring_from_id() non-static Revert "certs: move scripts/extract-cert to certs/"
integrity: support including firmware ".platform" keys at build time
MAINTAINERS | 1 +
certs/.gitignore | 1 -
certs/Makefile | 18 ++++++---------
certs/blacklist.c | 1 -
certs/common.c | 2 +-
certs/common.h | 9 --------
certs/system_keyring.c | 1 -
include/keys/system_keyring.h | 6 +++++
scripts/.gitignore | 1 +
scripts/Makefile | 12 ++++++++--
{certs => scripts}/extract-cert.c | 2 +-
scripts/remove-stale-files | 2 --
security/integrity/Kconfig | 10 ++++++++
security/integrity/Makefile | 15 +++++++++++-
security/integrity/digsig.c | 2 +-
security/integrity/integrity.h | 9 ++++++++
.../integrity/platform_certs/platform_cert.S | 23 +++++++++++++++++++
.../platform_certs/platform_keyring.c | 23 +++++++++++++++++++
18 files changed, 107 insertions(+), 31 deletions(-)
delete mode 100644 certs/common.h
rename {certs => scripts}/extract-cert.c (98%)
create mode 100644 security/integrity/platform_certs/platform_cert.Sbase-commit: fb5abce6b2bb5cb3d628aaa63fa821da8c4600f9
Signature · 1 line
2.34.1
PATCH v12 1/4 certs: export load_certificate_list() to be used outside certs/
load_certificate_list() parses certificates embedded in the kernel image to load them onto the keyring.
Commit "2565ca7f5ec1 (certs: Move load_system_certificate_list to a common function)" made load_certificate_list() a common function in the certs/ directory. Export load_certificate_list() outside certs/ to be used by load_platform_certificate_list() for loading compiled in platform keys onto the .platform keyring at boot time.
--- certs/Makefile | 5 +++-- certs/blacklist.c | 1 - certs/common.c | 2 +- certs/common.h | 9 --------- certs/system_keyring.c | 1 - include/keys/system_keyring.h | 6 ++++++ 6 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 certs/common.h
certs/Makefile +3 -2
@@ -3,8 +3,9 @@ # Makefile for the linux kernel signature checking certificates. # -obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o common.o -obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o +obj-$(CONFIG_KEYS) += common.o +obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o +obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o
certs/blacklist.c +0 -1
@@ -17,7 +17,6 @@#include <linux/uidgid.h> #include <keys/system_keyring.h> #include "blacklist.h" -#include "common.h" static struct key *blacklist_keyring;
certs/common.c +1 -1
@@ -2,7 +2,7 @@#include <linux/kernel.h> #include <linux/key.h> -#include "common.h" +#include <keys/system_keyring.h> int load_certificate_list(const u8 cert_list[], const unsigned long list_size,
certs/common.h deleted +0 -9
@@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef _CERT_COMMON_H -#define _CERT_COMMON_H - -int load_certificate_list (const u8 cert_list[],const unsigned long list_size, -const struct key *keyring); - -#endif
certs/system_keyring.c +0 -1
@@ -16,7 +16,6 @@#include <keys/asymmetric-type.h> #include <keys/system_keyring.h> #include <crypto/pkcs7.h> -#include "common.h" static struct key *builtin_trusted_keys;#ifdef CONFIG_SECONDARY_TRUSTED_KEYRING
include/keys/system_keyring.h +6 -0
@@ -10,6 +10,12 @@#include <linux/key.h> +#ifdef CONFIG_KEYS +int load_certificate_list (const u8 cert_list[], +const unsigned long list_size, +const struct key *keyring); +#endif +#ifdef CONFIG_SYSTEM_TRUSTED_KEYRING extern int restrict_link_by_builtin_trusted(struct key *keyring,
Signature · 1 line
2.34.1
Jarkko Sakkinen
maintainerRe: [PATCH v12 1/4] certs: export load_certificate_list() to be used outside certs/
Quoted 11 lines · Nayna Jain
load_certificate_list()parses certificates embedded in the kernel image to load them onto the keyring.Commit "
2565ca7f5ec1(certs: Moveload_system_certificate_listto a common function)" madeload_certificate_list()a common function in thecerts/directory. Exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()for loading compiled in platform keys onto the .platform keyring at boot time.Reviewed-by Mimi Zohar <[email protected]>Signed-off-by Nayna Jain <[email protected]>
Why all tested-by tags are still missing?
BR, Jarkko
PATCH v12 2/4 integrity: make integrity_keyring_from_id() non-static
In reply to Nayna JainMake integrity_keyring_from_id() non-static so that it is accessible by other files in security/integrity.
--- security/integrity/digsig.c | 2 +- security/integrity/integrity.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
security/integrity/digsig.c +1 -1
@@ -39,7 +39,7 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = {#define restrict_link_to_ima restrict_link_by_builtin_trusted#endif -static struct key *integrity_keyring_from_id (const unsigned int id) +struct key *integrity_keyring_from_id (const unsigned int id) {if (id >=INTEGRITY_KEYRING_MAX )return ERR_PTR (-EINVAL );
security/integrity/integrity.h +6 -0
@@ -168,6 +168,7 @@ int __init integrity_init_keyring(const unsigned int id);int __init integrity_load_x509 (const unsigned int id,const char *path);int __init integrity_load_cert (const unsigned int id,const char *source,const void *data,size_t len,key_perm_t perm); +struct key *integrity_keyring_from_id (const unsigned int id);#else static inline int integrity_digsig_verify(const unsigned int id,
@@ -195,6 +196,11 @@ static inline int __init integrity_load_cert(const unsigned int id, {return 0 ; } + +static inline struct key *integrity_keyring_from_id (const unsigned int id) +{ +return ERR_PTR (-EOPNOTSUPP ); +}#endif /* CONFIG_INTEGRITY_SIGNATURE */ #ifdef CONFIG_INTEGRITY_ASYMMETRIC_KEYS
Signature · 1 line
2.34.1
PATCH v12 3/4 Revert "certs: move scripts/extract-cert to certs/"
In reply to Nayna JainThis reverts commit 340a02535ee785c64c62a9c45706597a0139e972.
extract-cert is used outside certs/ by INTEGRITY_PLATFORM_KEYRING.
---
MAINTAINERS | 1 +
certs/.gitignore | 1 -
certs/Makefile | 13 ++++---------
scripts/.gitignore | 1 +
scripts/Makefile | 11 +++++++++--
{certs => scripts}/extract-cert.c | 2 +-
scripts/remove-stale-files | 2 --
7 files changed, 16 insertions(+), 15 deletions(-)
rename {certs => scripts}/extract-cert.c (98%)MAINTAINERS +1 -0
@@ -4471,6 +4471,7 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ +F: scripts/extract-cert.c F: scripts/sign-file.c CFAG12864B LCD DRIVER
certs/.gitignore +0 -1
@@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -/extract-cert /x509_certificate_list /x509_revocation_list
certs/Makefile +4 -9
@@ -14,11 +14,11 @@ obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif quiet_cmd_extract_certs = CERT $@ - cmd_extract_certs = $(obj)/extract-cert $(2) $@ + cmd_extract_certs = scripts/extract-cert $(2) $@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list -$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE +$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) scripts/extract-cert FORCE $(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_TRUSTED_KEYS),$<,"")) targets += x509_certificate_list
@@ -75,7 +75,7 @@ endif $(obj)/system_certificates.o: $(obj)/signing_key.x509 -$(obj)/signing_key.x509: $(X509_DEP) $(obj)/extract-cert FORCE +$(obj)/signing_key.x509: $(X509_DEP) scripts/extract-cert FORCE $(call if_changed,extract_certs,$(if $(CONFIG_MODULE_SIG_KEY),$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY)),"")) endif # CONFIG_MODULE_SIG
@@ -83,12 +83,7 @@ targets += signing_key.x509 $(obj)/revocation_certificates.o: $(obj)/x509_revocation_list -$(obj)/x509_revocation_list: $(CONFIG_SYSTEM_REVOCATION_KEYS) $(obj)/extract-cert FORCE +$(obj)/x509_revocation_list: $(CONFIG_SYSTEM_REVOCATION_KEYS) scripts/extract-cert FORCE $(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_REVOCATION_KEYS),$<,"")) targets += x509_revocation_list - -hostprogs := extract-cert - -HOSTCFLAGS_extract-cert.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) -HOSTLDLIBS_extract-cert = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)
scripts/.gitignore +1 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only /asn1_compiler /bin2c +/extract-cert /insert-sys-cert /kallsyms /module.lds
scripts/Makefile +9 -2
@@ -3,19 +3,26 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. +CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) + hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable hostprogs-always-$(CONFIG_ASN1) += asn1_compiler hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file +hostprogs-always-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert +hostprogs-always-$(CONFIG_SYSTEM_REVOCATION_LIST) += extract-cert HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include HOSTLDLIBS_sorttable = -lpthread HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include -HOSTCFLAGS_sign-file.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) -HOSTLDLIBS_sign-file = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) +HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_sign-file = $(CRYPTO_LIBS) +HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS) ifdef CONFIG_UNWINDER_ORC ifeq ($(ARCH),x86_64)
scripts/extract-cert.c renamed from certs/extract-cert.c +1 -1
@@ -29,7 +29,7 @@ static __attribute__((noreturn))void format (void ) {fprintf (stderr, -"Usage: extract-cert <source> <dest>\n" ); +"Usage: scripts/extract-cert <source> <dest>\n" );exit (2 ); }
scripts/remove-stale-files +0 -2
@@ -39,5 +39,3 @@ if [ -n "${building_out_of_srctree}" ]; then rm -f arch/parisc/boot/compressed/${f} done fi - -rm -f scripts/extract-cert
Signature · 1 line
2.34.1
Re: [PATCH v12 3/4] Revert "certs: move scripts/extract-cert to certs/"
Quoted 3 lines · Nayna Jain
This reverts commit
340a02535ee785c64c62a9c45706597a0139e972.extract-cert is used outside
certs/byINTEGRITY_PLATFORM_KEYRING.
Hi Masahiro,
Could you review and Ack this patch ?
Thanks & Regards,
- Nayna
Quoted 146 lines
Signed-off-by Nayna Jain <[email protected]>--- MAINTAINERS | 1 + certs/.gitignore | 1 - certs/Makefile | 13 ++++--------- scripts/.gitignore | 1 + scripts/Makefile | 11 +++++++++-- {certs => scripts}/extract-cert.c | 2 +- scripts/remove-stale-files | 2 -- 7 files changed, 16 insertions(+), 15 deletions(-)rename {certs =>
scripts}/extract-cert.c(98%)MAINTAINERS +1
-0@@ -4471,6 +4471,7 @@ L: [email protected] S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ +F: scripts/extract-cert.c F: scripts/sign-file.c CFAG12864B LCD DRIVERcerts/.gitignore +0
-1@@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -/extract-cert /x509_certificate_list /x509_revocation_listcerts/Makefile +4
-9@@ -14,11 +14,11 @@ obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o endif quiet_cmd_extract_certs = CERT $@ - cmd_extract_certs = $(obj)/extract-cert $(2) $@ + cmd_extract_certs = scripts/extract-cert $(2) $@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list -$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE +$(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) scripts/extract-cert FORCE $(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_TRUSTED_KEYS),$<,"")) targets += x509_certificate_list@@ -75,7 +75,7 @@ endif $(obj)/system_certificates.o: $(obj)/signing_key.x509 -$(obj)/signing_key.x509: $(X509_DEP) $(obj)/extract-cert FORCE +$(obj)/signing_key.x509: $(X509_DEP) scripts/extract-cert FORCE $(call if_changed,extract_certs,$(if $(CONFIG_MODULE_SIG_KEY),$(if $(X509_DEP),$<,$(CONFIG_MODULE_SIG_KEY)),"")) endif # CONFIG_MODULE_SIG@@ -83,12 +83,7 @@ targets += signing_key.x509 $(obj)/revocation_certificates.o: $(obj)/x509_revocation_list -$(obj)/x509_revocation_list: $(CONFIG_SYSTEM_REVOCATION_KEYS) $(obj)/extract-cert FORCE +$(obj)/x509_revocation_list: $(CONFIG_SYSTEM_REVOCATION_KEYS) scripts/extract-cert FORCE $(call if_changed,extract_certs,$(if $(CONFIG_SYSTEM_REVOCATION_KEYS),$<,"")) targets += x509_revocation_list - -hostprogs := extract-cert - -HOSTCFLAGS_extract-cert.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) -HOSTLDLIBS_extract-cert = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)scripts/.gitignore +1
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only /asn1_compiler /bin2c +/extract-cert /insert-sys-cert /kallsyms /module.ldsscripts/Makefile +9
-2@@ -3,19 +3,26 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. +CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) + hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-always-$(CONFIG_BUILDTIME_TABLE_SORT) += sorttable hostprogs-always-$(CONFIG_ASN1) += asn1_compiler hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file +hostprogs-always-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert +hostprogs-always-$(CONFIG_SYSTEM_REVOCATION_LIST) += extract-cert HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include HOSTLDLIBS_sorttable = -lpthread HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include -HOSTCFLAGS_sign-file.o = $(shell pkg-config --cflags libcrypto 2> /dev/null) -HOSTLDLIBS_sign-file = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) +HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_sign-file = $(CRYPTO_LIBS) +HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS) +HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS) ifdef CONFIG_UNWINDER_ORC ifeq ($(ARCH),x86_64)scripts/extract-cert.c renamed from certs/extract-cert.c +1
-1@@ -29,7 +29,7 @@ static __attribute__((noreturn))void format (void ) {fprintf (stderr, -"Usage: extract-cert <source> <dest>\n" ); +"Usage: scripts/extract-cert <source> <dest>\n" );exit (2 ); }scripts/remove-stale-files +0
-2@@ -39,5 +39,3 @@ if [ -n "${building_out_of_srctree}" ]; then rm -f arch/parisc/boot/compressed/${f} done fi - -rm -f scripts/extract-cert
PATCH v12 4/4 integrity: support including firmware ".platform" keys at build time
In reply to Nayna JainAllow firmware keys to be embedded in the Linux kernel and loaded onto the ".platform" keyring on boot.
The firmware keys can be specified in a file as a list of PEM encoded certificates using new config INTEGRITY_PLATFORM_KEYS. The certificates are embedded in the image by converting the PEM-formatted certificates into DER(binary) and generating security/integrity/platform_certs/platform_certificate_list file at build time. On boot, the embedded certs from the image are loaded onto the ".platform" keyring at late_initcall(), ensuring the platform keyring exists before loading the keys.
--- scripts/Makefile | 1 + security/integrity/Kconfig | 10 ++++++++ security/integrity/Makefile | 15 +++++++++++- security/integrity/integrity.h | 3 +++ .../integrity/platform_certs/platform_cert.S | 23 +++++++++++++++++++ .../platform_certs/platform_keyring.c | 23 +++++++++++++++++++ 6 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 security/integrity/platform_certs/platform_cert.S
scripts/Makefile +1 -0
@@ -15,6 +15,7 @@ hostprogs-always-$(CONFIG_MODULE_SIG_FORMAT) += sign-file hostprogs-always-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert hostprogs-always-$(CONFIG_SYSTEM_REVOCATION_LIST) += extract-cert +hostprogs-always-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += extract-cert HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include HOSTLDLIBS_sorttable = -lpthread
security/integrity/Kconfig +10 -0
@@ -62,6 +62,16 @@ config INTEGRITY_PLATFORM_KEYRING provided by the platform for verifying the kexec'ed kerned image and, possibly, the initramfs signature. +config INTEGRITY_PLATFORM_KEYS + string "Builtin X.509 keys for .platform keyring" + depends on KEYS + depends on ASYMMETRIC_KEY_TYPE + depends on INTEGRITY_PLATFORM_KEYRING + help + If set, this option should be the filename of a PEM-formatted file + containing X.509 certificates to be loaded onto the ".platform" + keyring. + config INTEGRITY_MACHINE_KEYRING bool "Provide a keyring to which Machine Owner Keys may be added" depends on SECONDARY_TRUSTED_KEYRING
security/integrity/Makefile +14 -1
@@ -3,13 +3,17 @@ # Makefile for caching inode integrity data (iint) # +quiet_cmd_extract_certs = CERT $@ + cmd_extract_certs = scripts/extract-cert $(2) $@ + obj-$(CONFIG_INTEGRITY) += integrity.o integrity-y := iint.o integrity-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o integrity-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o integrity-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o -integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o +integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o \ + platform_certs/platform_cert.o integrity-$(CONFIG_INTEGRITY_MACHINE_KEYRING) += platform_certs/machine_keyring.o integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o \
@@ -20,3 +24,12 @@ integrity-$(CONFIG_LOAD_PPC_KEYS) += platform_certs/efi_parser.o \ platform_certs/keyring_handler.o obj-$(CONFIG_IMA) += ima/ obj-$(CONFIG_EVM) += evm/ + +$(obj)/platform_certs/platform_cert.o: $(obj)/platform_certs/platform_certificate_list + +targets += platform_certificate_list + +$(obj)/platform_certs/platform_certificate_list: $(CONFIG_INTEGRITY_PLATFORM_KEYS) scripts/extract-cert FORCE + $(call if_changed,extract_certs,$(if $(CONFIG_INTEGRITY_PLATFORM_KEYS),$<,"")) + +clean-files := platform_certs/platform_certificate_list
security/integrity/integrity.h +3 -0
@@ -282,6 +282,9 @@ integrity_audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type)#endif #ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING +extern __initconst const u8 platform_certificate_list[]; +extern __initconst const unsigned long platform_certificate_list_size; +void __init add_to_platform_keyring (const char *source,const void *data,size_t len);#else
security/integrity/platform_certs/platform_cert.S new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <linux/export.h> +#include <linux/init.h> + + __INITRODATA + + .align 8 +#ifdef CONFIG_INTEGRITY_PLATFORM_KEYRING + .globl platform_certificate_list +platform_certificate_list: +__cert_list_start: + .incbin "security/integrity/platform_certs/platform_certificate_list" +__cert_list_end: +#endif + + .align 8 + .globl platform_certificate_list_size +platform_certificate_list_size: +#ifdef CONFIG_64BIT + .quad __cert_list_end - __cert_list_start +#else + .long __cert_list_end - __cert_list_start +#endif
security/integrity/platform_certs/platform_keyring.c +23 -0
@@ -12,6 +12,7 @@#include <linux/cred.h> #include <linux/err.h> #include <linux/slab.h> +#include <keys/system_keyring.h> #include "../integrity.h" /**
@@ -37,6 +38,28 @@ void __init add_to_platform_keyring(const char *source, const void *data,pr_info ("Error adding keys to platform keyring %s\n" , source); } +static __init int load_platform_certificate_list (void ) +{ +const u8 *p; +unsigned long size; +int rc; +struct key *keyring; + + p = platform_certificate_list; + size = platform_certificate_list_size; + + keyring =integrity_keyring_from_id (INTEGRITY_KEYRING_PLATFORM ); +if (IS_ERR (keyring)) +return PTR_ERR (keyring); + + rc =load_certificate_list (p, size, keyring); +if (rc) +pr_info ("Error adding keys to platform keyring %d\n" , rc); + +return rc; +} +late_initcall (load_platform_certificate_list); +/* * Create the trusted keyrings. */
Signature · 1 line
2.34.1
Quoted 6 lines · Nayna Jain
Some firmware support secure boot by embedding static keys to verify the Linux kernel during boot. However, these firmware do not expose an interface for the kernel to load firmware keys onto the ".platform" keyring, preventing the kernel from verifying the kexec kernel image signature.
Quoted 9 lines
This patchset exports
load_certificate_list()and defines a new functionload_builtin_platform_cert()to load compiled in certificates onto the ".platform" keyring.Changelog:
v12:
* Replace Patch 3/4 with reverting of the commit as suggested by Masahiro Yamada.
Tested the following four patches ov v12 with and with out setting CONFIG_INTEGRITY_PLATFORM_KEYS
1. With CONFIG_INTEGRITY_PLATFORM_KEYS set to a key
# grep pem .config CONFIG_INTEGRITY_PLATFORM_KEYS="certs/kernel.pem" CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"
# grep "CONFIG_INTEGRITY_PLATFORM_KEYS\|INTEGRITY_PLATFORM_KEYRING\|SYSTEM_REVOCATION_LIST" .config CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYS="certs/kernel.pem" # CONFIG_SYSTEM_REVOCATION_LIST is not set
# cat /proc/keys | grep platform 0a7a11a9 I------ 1 perm 1f0b0000 0 0 keyring .platform: 1
# keyctl show %keyring:.platform Keyring 175772073 ---lswrv 0 0 keyring: .platform 519271447 ---lswrv 0 0 \_ asymmetric: IBM Corporation: Guest Secure Boot Imprint Kernel Signing Key: a0cf9069c30875320cb10a77325d4fa7012f8d12
2. With out CONFIG_INTEGRITY_PLATFORM_KEYS set, leaving empty
# grep pem .config CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"
# grep "CONFIG_INTEGRITY_PLATFORM_KEYS\|INTEGRITY_PLATFORM_KEYRING\|SYSTEM_REVOCATION_LIST" .config CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_PLATFORM_KEYS="" # CONFIG_SYSTEM_REVOCATION_LIST is not set
# cat /proc/keys | grep platform 39c749b9 I------ 1 perm 1f0b0000 0 0 keyring .platform: empty
# keyctl show %keyring:.platform Keyring 969361849 ---lswrv 0 0 keyring: .platform
Quoted 2 lines
base-commit:
fb5abce6b2bb5cb3d628aaa63fa821da8c4600f9
Signature · 2 lines
Thanks and Regards R.Nageswara Sastry