integrity: support including firmware ".platform" keys at build time
Subsystems (7)
v7 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.
Note: It seems last time my patches didn't go through mailing list. My apologies to those who are receiving it twice.
Changelog:
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 (3):
certs: export load_certificate_list() to be used outside certs/
integrity: make integrity_keyring_from_id() non-static
integrity: support including firmware ".platform" keys at build 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 +++++ security/integrity/Kconfig | 10 +++++++ security/integrity/Makefile | 17 +++++++++++- security/integrity/digsig.c | 2 +- security/integrity/integrity.h | 6 +++++ .../integrity/platform_certs/platform_cert.S | 23 ++++++++++++++++ .../platform_certs/platform_keyring.c | 26 +++++++++++++++++++ 12 files changed, 92 insertions(+), 16 deletions(-) delete mode 100644 certs/common.h create mode 100644 security/integrity/platform_certs/platform_cert.S
Signature · 1 line
2.27.0
PATCH v7 1/3 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. Now, export load_certificate_list() outside certs/ to be used by load_platform_certificate_list() which is added later in the patchset.
--- 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.27.0
PATCH v7 2/3 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
@@ -38,7 +38,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
@@ -167,6 +167,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,
@@ -194,6 +195,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.27.0
PATCH v7 3/3 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.
--- security/integrity/Kconfig | 10 +++++++ security/integrity/Makefile | 17 +++++++++++- .../integrity/platform_certs/platform_cert.S | 23 ++++++++++++++++ .../platform_certs/platform_keyring.c | 26 +++++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 security/integrity/platform_certs/platform_cert.S
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 LOAD_UEFI_KEYS depends on INTEGRITY_PLATFORM_KEYRING depends on EFI
security/integrity/Makefile +16 -1
@@ -3,13 +3,18 @@ # Makefile for caching inode integrity data (iint) # +quiet_cmd_extract_certs = EXTRACT_CERTS $(patsubst "%",%,$(2)) + cmd_extract_certs = scripts/extract-cert $(2) $@ +$(eval $(call config_filename,INTEGRITY_PLATFORM_KEYS)) + 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_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o \ platform_certs/keyring_handler.o
@@ -19,3 +24,13 @@ 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: scripts/extract-cert $(INTEGRITY_PLATFORM_KEYS_FILENAME) FORCE + $(call if_changed,extract_certs,$(CONFIG_INTEGRITY_PLATFORM_KEYS)) + +clean-files := platform_certs/platform_certificate_list
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 +26 -0
@@ -12,8 +12,12 @@#include <linux/cred.h> #include <linux/err.h> #include <linux/slab.h> +#include <keys/system_keyring.h> #include "../integrity.h" +extern __initconst const u8 platform_certificate_list[]; +extern __initconst const unsigned long platform_certificate_list_size; +/** * add_to_platform_keyring - Add to platform keyring without validation. * @source: Source of key
@@ -37,6 +41,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.27.0
Jarkko Sakkinen
maintainerRe: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
In reply to Nayna JainQuoted 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.Reviewed-by Mimi Zohar <[email protected]>Signed-off-by Nayna Jain <[email protected]>
This lacking fixes tag, if it is a bug, or "reported-by" needs to be completely removed.
/Jarkko
Jarkko Sakkinen
maintainerRe: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
In reply to Nayna JainQuoted 7 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.
Also, please describe the specific use it will be used. Patchset is not a valid cross-reference in this context.
/Jarkko
Mimi Zohar
maintainerRe: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
Hi Jarkko,
Quoted 11 lines · Jarkko Sakkinen
Quoted 7 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.Also, please describe the specific use it will be used. Patchset is not a valid cross-reference in this context.
The specific usecase scenario is described in the cover letter. Is that what you're looking for?
thanks,
Mimi
Re: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
In reply to Jarkko SakkinenQuoted 9 lines · Jarkko Sakkinen
Quoted 8 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.
Quoted 5 lines
Quoted 3 lines
Reviewed-by Mimi Zohar <[email protected]>Signed-off-by Nayna Jain <[email protected]>This lacking fixes tag, if it is a bug, or "reported-by" needs to be completely removed.
When I posted my first version for this patch set, kernel test robot reported the build error - https://lore.kernel.org/linux-integrity/[email protected]/
The Reported-by tag is because of this statement in the reported error - " If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <[email protected]>"
Do you still think that the tag is not required ? If so, I am fine to remove it.
Thanks & Regards,
- Nayna
Jarkko Sakkinen
maintainerRe: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
In reply to Mimi ZoharQuoted 12 lines · Mimi Zohar
Hi Jarkko,
Quoted 9 lines · Jarkko Sakkinen
Quoted 7 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.
Quoted 5 lines
Quoted 2 lines
Also, please describe the specific use it will be used. Patchset is not a valid cross-reference in this context.
The specific usecase scenario is described in the cover letter. Is that what you're looking for?
You cannot refer to "a patch set" in the long description. It's by all practical means a dead ref after some years. The commit messages are meant for commit log to help to understand the history of changes. This does not do that job. Neither a cover letter helps with this.
/Jarkko
Jarkko Sakkinen
maintainerRe: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
In reply to NaynaQuoted 21 lines · Nayna
Quoted 9 lines · Jarkko Sakkinen
Quoted 8 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.Quoted 5 lines
Quoted 3 lines
Reviewed-by Mimi Zohar <[email protected]>Signed-off-by Nayna Jain <[email protected]>This lacking fixes tag, if it is a bug, or "reported-by" needs to be completely removed.
When I posted my first version for this patch set, kernel test robot reported the build error -
https://lore.kernel.org/linux-integrity/[email protected]/
Quoted 6 lines
The Reported-by tag is because of this statement in the reported error - " If you fix the issue, kindly add following tag as appropriate Reported-by:
kernel test robot <[email protected]>"Do you still think that the tag is not required ? If so, I am fine to remove it.
It makes absolutely no sense for anything that is not triggered by the mainline code.
/Jarkko
Jarkko Sakkinen
maintainerRe: [PATCH v7 1/3] certs: export load_certificate_list() to be used outside certs/
Quoted 26 lines · Jarkko Sakkinen
Quoted 25 lines · Nayna
Quoted 9 lines · Jarkko Sakkinen
Quoted 8 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. Now, exportload_certificate_list()outsidecerts/to be used byload_platform_certificate_list()which is added later in the patchset.Quoted 5 lines
Quoted 3 lines
Reviewed-by Mimi Zohar <[email protected]>Signed-off-by Nayna Jain <[email protected]>This lacking fixes tag, if it is a bug, or "reported-by" needs to be completely removed.
When I posted my first version for this patch set, kernel test robot reported the build error -
https://lore.kernel.org/linux-integrity/[email protected]/The Reported-by tag is because of this statement in the reported error - " If you fix the issue, kindly add following tag as appropriate Reported-by:
kernel test robot <[email protected]>"
Quoted 5 lines
Quoted 2 lines
Do you still think that the tag is not required ? If so, I am fine to remove it.
It makes absolutely no sense for anything that is not triggered by the mainline code.
I.e. if it is not merged, there is no bug.
/Jarkko