integrity: support including firmware ".platform" keys at build time
Subsystems (7)
PATCH v2 1/1 integrity: support including firmware ".platform" keys at build time
Some firmware support secureboot 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 ".platform" keyring. This would prevent kernel signature verification on kexec. For those environments, allow firmware keys to be compiled into the kernel and loaded onto the ".platform" keyring.
---
v2:
* Fixed the error reported by kernel test robot
* Updated patch description based on Jarkko's feedback.
certs/Makefile | 3 ++- certs/blacklist.c | 1 - certs/common.c | 2 +- certs/common.h | 9 ------- certs/system_keyring.c | 1 - include/keys/system_keyring.h | 3 +++ 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, 88 insertions(+), 15 deletions(-) delete mode 100644 certs/common.h create mode 100644 security/integrity/platform_certs/platform_cert.S
certs/Makefile +2 -1
@@ -3,7 +3,8 @@ # Makefile for the linux kernel signature checking certificates. # -obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.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 common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"")
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 +3 -0
@@ -10,6 +10,9 @@#include <linux/key.h> +extern int load_certificate_list (const u8 cert_list[], +const unsigned long list_size, +const struct key *keyring);#ifdef CONFIG_SYSTEM_TRUSTED_KEYRING extern int restrict_link_by_builtin_trusted(struct key *keyring,
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_BUILTIN_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_BUILTIN_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_BUILTIN_KEYS_FILENAME) FORCE + $(call if_changed,extract_certs,$(CONFIG_INTEGRITY_PLATFORM_BUILTIN_KEYS)) + +clean-files := platform_certs/platform_certificate_list
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
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_builtin_platform_cert (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_builtin_platform_cert); +/* * Create the trusted keyrings. */
Signature · 1 line
2.27.0
Jarkko Sakkinen
maintainerQuoted 6 lines · Nayna Jain
Some firmware support secureboot 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 ".platform" keyring. This would prevent kernel signature verification on kexec. For those environments, allow firmware keys to be compiled into the kernel and loaded onto the ".platform" keyring.
"allow" means absolutely nothing. Just tell what your patch does, and approach taken. Already the patch description should roughly give idea what and why of code changes. There's nothing here.
Quoted 2 lines
Reported-by kernel test robot <[email protected]>
I don't get this reported-by here.
Quoted 54 lines
Signed-off-by Nayna Jain <[email protected]>---
v2:
* Fixed the error reported by kernel test robot
* Updated patch description based on Jarkko's feedback.certs/Makefile | 3 ++- certs/blacklist.c | 1 - certs/common.c | 2 +- certs/common.h | 9 ------- certs/system_keyring.c | 1 - include/keys/system_keyring.h | 3 +++ 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, 88 insertions(+), 15 deletions(-) delete mode 100644 certs/common.h create mode 100644 security/integrity/platform_certs/platform_cert.Scerts/Makefile +2
-1@@ -3,7 +3,8 @@ # Makefile for the linux kernel signature checking certificates. # -obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.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 common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"")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 +0
-0
certs/common.c line 5
Quoted 4 lines
certs/common.c +0
-1@@ -2,7 +2,7 @@#include <linux/kernel.h> #include <linux/key.h> -#include "common.h"
Why this include is removed?
You should include to your commit message *also* the approach you are taking. If you export a function, you should mention it explicitly.
Quoted 36 lines
certs/common.c +1
-0+#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 +0
-0
include/keys/system_keyring.h line 15
Quoted 6 lines
include/keys/system_keyring.h +3
-0@@ -10,6 +10,9 @@#include <linux/key.h> +extern int load_certificate_list (const u8 cert_list[], +const unsigned long list_size, +const struct key *keyring);
Remove "extern". It's not needed for functions.
Quoted 164 lines
include/keys/system_keyring.h +0
-0#ifdef CONFIG_SYSTEM_TRUSTED_KEYRING extern int restrict_link_by_builtin_trusted(struct key *keyring,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_BUILTIN_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 EFIsecurity/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_BUILTIN_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_BUILTIN_KEYS_FILENAME) FORCE + $(call if_changed,extract_certs,$(CONFIG_INTEGRITY_PLATFORM_BUILTIN_KEYS)) + +clean-files := platform_certs/platform_certificate_listsecurity/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 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 +#endifsecurity/integrity/platform_certs/platform_keyring.c +19
-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_builtin_platform_cert (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);
security/integrity/platform_certs/platform_keyring.c void __init add_to_platform_keyring(const char *source, const void *data, · line 68
Quoted 10 lines
security/integrity/platform_certs/platform_keyring.c +7
-0+if (rc) +pr_info ("Error adding keys to platform keyring %d\n" , rc); + +return rc; +} +late_initcall (load_builtin_platform_cert); +/* * Create the trusted keyrings. */
/Jarkko
Quoted 69 lines · Jarkko Sakkinen
Quoted 6 lines · Nayna Jain
Some firmware support secureboot 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 ".platform" keyring. This would prevent kernel signature verification on kexec. For those environments, allow firmware keys to be compiled into the kernel and loaded onto the ".platform" keyring.
"allow" means absolutely nothing. Just tell what your patch does, and approach taken. Already the patch description should roughly give idea what and why of code changes. There's nothing here.
Quoted 1 line
Reported-by kernel test robot <[email protected]>I don't get this reported-by here.
Quoted 55 lines
Signed-off-by Nayna Jain <[email protected]>---
v2:
* Fixed the error reported by kernel test robot
* Updated patch description based on Jarkko's feedback.certs/Makefile | 3 ++- certs/blacklist.c | 1 - certs/common.c | 2 +- certs/common.h | 9 ------- certs/system_keyring.c | 1 - include/keys/system_keyring.h | 3 +++ 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, 88 insertions(+), 15 deletions(-)delete mode 100644
certs/common.h
create mode 100644security/integrity/platform_certs/platform_cert.Scerts/Makefile +2
-1@@ -3,7 +3,8 @@ # Makefile for the linux kernel signature checking certificates. # -obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.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 common.o obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),"")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 +0
-0@@ -2,7 +2,7 @@
Quoted 8 lines
certs/common.c line 5
Quoted 3 lines
certs/common.c +0
-1#include <linux/kernel.h> #include <linux/key.h> -#include "common.h" Why this include is removed?
You should include to your commit message *also* the approach you are taking. If you export a function, you should mention it explicitly.
Thanks Jarrko for the review.
Do you think it would be better to split this patch into two ?
Patch 1: Export load_certificate_list() to be called outside certs/
Patch 2: Add and load compiled-in certificates in ".platform" keyring.
Thanks & Regards,
- Nayna