certs: Add EFI_CERT_X509_GUID support for dbx entries
Subsystems (6)
Eric Snowberg
reviewerRFC PATCH 1/1 certs: Add EFI_CERT_X509_GUID support for dbx entries
The Secure Boot Forbidden Signature Database, dbx, contains a list of now revoked signatures and keys previously approved to boot with UEFI Secure Boot enabled. The dbx is capable of containing any number of EFI_CERT_X509_SHA256_GUID, EFI_CERT_SHA256_GUID, and EFI_CERT_X509_GUID entries.
Currently when EFI_CERT_X509_GUID are contained in the dbx, the entries are skipped.
This change adds support for EFI_CERT_X509_GUID dbx entries. When a EFI_CERT_X509_GUID is found, it is added as an asymmetrical key to the .blacklist keyring. Anytime the .platform keyring is used, the keys in the .blacklist keyring are referenced, if a matching key is found, the key will be rejected.
--- certs/blacklist.c | 36 +++++++++++++++++++ certs/system_keyring.c | 6 ++++ include/keys/system_keyring.h | 11 ++++++ .../platform_certs/keyring_handler.c | 11 ++++++ 4 files changed, 64 insertions(+)
certs/blacklist.c +36 -0
@@ -15,6 +15,7 @@#include <linux/err.h> #include <linux/seq_file.h> #include <keys/system_keyring.h> +#include <crypto/pkcs7.h> #include "blacklist.h" static struct key *blacklist_keyring;
@@ -100,6 +101,41 @@ int mark_hash_blacklisted(const char *hash)return 0 ; } +int mark_key_revocationlisted (const char *data,size_t size) +{ +key_ref_t key; + + key =key_create_or_update (make_key_ref (blacklist_keyring, true), +"asymmetric" , +NULL , + data, + size, + ((KEY_POS_ALL & ~KEY_POS_SETATTR ) | +KEY_USR_VIEW ), +KEY_ALLOC_NOT_IN_QUOTA | +KEY_ALLOC_BUILT_IN ); + +if (IS_ERR (key)) { +pr_err ("Problem with revocation key (%ld)\n" ,PTR_ERR (key)); +return PTR_ERR (key); + } + +return 0 ; +} + +int is_key_revocationlisted (struct pkcs7_message *pkcs7) +{ +int ret; + + ret =pkcs7_validate_trust (pkcs7, blacklist_keyring); + +if (ret =0 ) +return -EKEYREJECTED ; + +return -ENOKEY ; +} +EXPORT_SYMBOL_GPL (is_key_revocationlisted); +/** * is_hash_blacklisted - Determine if a hash is blacklisted * @hash: The hash to be checked as a binary blob
certs/system_keyring.c +6 -0
@@ -241,6 +241,12 @@ int verify_pkcs7_message_sig(const void *data, size_t len,pr_devel ("PKCS#7 platform keyring is not available\n" ); goto error; } + + ret =is_key_revocationlisted (pkcs7); +if (ret != -ENOKEY ) { +pr_devel ("PKCS#7 platform key revocationlisted\n" ); + goto error; + } } ret =pkcs7_validate_trust (pkcs7, trusted_keys);if (ret <0 ) {
include/keys/system_keyring.h +11 -0
@@ -31,11 +31,14 @@ extern int restrict_link_by_builtin_and_secondary_trusted(#define restrict_link_by_builtin_and_secondary_trusted restrict_link_by_builtin_trusted#endif +extern struct pkcs7_message *pkcs7;#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING extern int mark_hash_blacklisted (const char *hash); +extern int mark_key_revocationlisted (const char *data,size_t size);extern int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type);extern int is_binary_blacklisted (const u8 *hash,size_t hash_len); +extern int is_key_revocationlisted (struct pkcs7_message *pkcs7);#else static inline int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type)
@@ -47,6 +50,14 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len) {return 0 ; } +static inline int mark_key_revocationlisted (const char *data,size_t size) +{ +return 0 ; +} +static inline int is_key_revocationlisted (struct pkcs7_message *pkcs7) +{ +return -ENOKEY ; +}#endif #ifdef CONFIG_IMA_BLACKLIST_KEYRING
security/integrity/platform_certs/keyring_handler.c +11 -0
@@ -55,6 +55,15 @@ static __init void uefi_blacklist_binary(const char *source,uefi_blacklist_hash (source, data, len,"bin:" ,4 ); } +/* +* Revocationlist the X509 cert +*/ +static __init void uefi_revocationlist_x509 (const char *source, +const void *data,size_t len) +{ +mark_key_revocationlisted (data, len); +} +/* * Return the appropriate handler for particular signature list types found in * the UEFI db and MokListRT tables.
@@ -76,5 +85,7 @@ __init efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_type)return uefi_blacklist_x509_tbs;if (efi_guidcmp (*sig_type, efi_cert_sha256_guid) =0 )return uefi_blacklist_binary; +if (efi_guidcmp (*sig_type, efi_cert_x509_guid) =0 ) +return uefi_revocationlist_x509;return 0 ; }
Signature · 1 line
2.18.1
kernel test robot
build bot[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]
Hi Eric,
[FYI, it's a private test report for your RFC patch.]
[auto build test ERROR on security/next-testing]
[also build test ERROR on linux/master linus/master v5.9-rc3 next-20200828] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Eric-Snowberg/certs-Add-EFI_CERT_X509_GUID-support-for-dbx-entries/20200902-005327 base: https://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-testing config: i386-randconfig-m021-20200901 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
ld: certs/blacklist.o: in function `is_key_revocationlisted':
>> certs/blacklist.c:130: undefined reference to `pkcs7_validate_trust'
# https://github.com/0day-ci/linux/commit/7daca19902c4112ce4d7eb2c092093360980ca0c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Eric-Snowberg/certs-Add-EFI_CERT_X509_GUID-support-for-dbx-entries/20200902-005327 git checkout 7daca19902c4112ce4d7eb2c092093360980ca0c
vim +130 certs/blacklist.c
125
126 int is_key_revocationlisted(struct pkcs7_message *pkcs7)
127 {
128 int ret;
129
> 130 ret = pkcs7_validate_trust(pkcs7, blacklist_keyring);
131
132 if (ret == 0)
133 return -EKEYREJECTED;
134
135 return -ENOKEY;
136 }
137 EXPORT_SYMBOL_GPL(is_key_revocationlisted);
138
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [RFC PATCH] certs: Add EFI_CERT_X509_GUID support for dbx entries]
In reply to Eric SnowbergQuoted 9 lines · Eric Snowberg
The Secure Boot Forbidden Signature Database, dbx, contains a list of now revoked signatures and keys previously approved to boot with UEFI Secure Boot enabled. The dbx is capable of containing any number of
EFI_CERT_X509_SHA256_GUID,EFI_CERT_SHA256_GUID, andEFI_CERT_X509_GUIDentries.Currently when
EFI_CERT_X509_GUIDare contained in the dbx, the entries are skipped.
Quoted 7 lines
This change adds support for
EFI_CERT_X509_GUIDdbx entries. When aEFI_CERT_X509_GUIDis found, it is added as an asymmetrical key to the .blacklist keyring. Anytime the .platform keyring is used, the keys in the .blacklist keyring are referenced, if a matching key is found, the key will be rejected.Signed-off-by Eric Snowberg <[email protected]>
In the last paragraph, please use imperative form: "Add support for ...".
Quoted 143 lines
--- certs/blacklist.c | 36 +++++++++++++++++++ certs/system_keyring.c | 6 ++++ include/keys/system_keyring.h | 11 ++++++ .../platform_certs/keyring_handler.c | 11 ++++++ 4 files changed, 64 insertions(+)certs/blacklist.c +36
-0@@ -15,6 +15,7 @@#include <linux/err.h> #include <linux/seq_file.h> #include <keys/system_keyring.h> +#include <crypto/pkcs7.h> #include "blacklist.h" static struct key *blacklist_keyring;@@ -100,6 +101,41 @@ int mark_hash_blacklisted(const char *hash)return 0 ; } +int mark_key_revocationlisted (const char *data,size_t size) +{ +key_ref_t key; + + key =key_create_or_update (make_key_ref (blacklist_keyring, true), +"asymmetric" , +NULL , + data, + size, + ((KEY_POS_ALL & ~KEY_POS_SETATTR ) | +KEY_USR_VIEW ), +KEY_ALLOC_NOT_IN_QUOTA | +KEY_ALLOC_BUILT_IN ); + +if (IS_ERR (key)) { +pr_err ("Problem with revocation key (%ld)\n" ,PTR_ERR (key)); +return PTR_ERR (key); + } + +return 0 ; +} + +int is_key_revocationlisted (struct pkcs7_message *pkcs7) +{ +int ret; + + ret =pkcs7_validate_trust (pkcs7, blacklist_keyring); + +if (ret =0 ) +return -EKEYREJECTED ; + +return -ENOKEY ; +} +EXPORT_SYMBOL_GPL (is_key_revocationlisted); +/** * is_hash_blacklisted - Determine if a hash is blacklisted * @hash: The hash to be checked as a binary blob certs/system_keyring.c +6
-0@@ -241,6 +241,12 @@ int verify_pkcs7_message_sig(const void *data, size_t len,pr_devel ("PKCS#7 platform keyring is not available\n" ); goto error; } + + ret =is_key_revocationlisted (pkcs7); +if (ret != -ENOKEY ) { +pr_devel ("PKCS#7 platform key revocationlisted\n" ); + goto error; + } } ret =pkcs7_validate_trust (pkcs7, trusted_keys);if (ret <0 ) {include/keys/system_keyring.h +11
-0@@ -31,11 +31,14 @@ extern int restrict_link_by_builtin_and_secondary_trusted(#define restrict_link_by_builtin_and_secondary_trusted restrict_link_by_builtin_trusted#endif +extern struct pkcs7_message *pkcs7;#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING extern int mark_hash_blacklisted (const char *hash); +extern int mark_key_revocationlisted (const char *data,size_t size);extern int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type);extern int is_binary_blacklisted (const u8 *hash,size_t hash_len); +extern int is_key_revocationlisted (struct pkcs7_message *pkcs7);#else static inline int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type)@@ -47,6 +50,14 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len) {return 0 ; } +static inline int mark_key_revocationlisted (const char *data,size_t size) +{ +return 0 ; +} +static inline int is_key_revocationlisted (struct pkcs7_message *pkcs7) +{ +return -ENOKEY ; +}#endif #ifdef CONFIG_IMA_BLACKLIST_KEYRING security/integrity/platform_certs/keyring_handler.c +11
-0@@ -55,6 +55,15 @@ static __init void uefi_blacklist_binary(const char *source,uefi_blacklist_hash (source, data, len,"bin:" ,4 ); } +/* +* Revocationlist the X509 cert +*/ +static __init void uefi_revocationlist_x509 (const char *source, +const void *data,size_t len) +{ +mark_key_revocationlisted (data, len); +} +/* * Return the appropriate handler for particular signature list types found in * the UEFI db and MokListRT tables. @@ -76,5 +85,7 @@ __init efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_type)return uefi_blacklist_x509_tbs;if (efi_guidcmp (*sig_type, efi_cert_sha256_guid) =0 )return uefi_blacklist_binary; +if (efi_guidcmp (*sig_type, efi_cert_x509_guid) =0 ) +return uefi_revocationlist_x509;return 0 ; }Signature · 1 line
2.18.1
I did not find anything wrong with the code change.
/Jarkko
Eric Snowberg
reviewerRe: [RFC PATCH] certs: Add EFI_CERT_X509_GUID support for dbx entries]
Quoted 19 lines · Jarkko Sakkinen
Quoted 15 lines · Eric Snowberg
The Secure Boot Forbidden Signature Database, dbx, contains a list of now revoked signatures and keys previously approved to boot with UEFI Secure Boot enabled. The dbx is capable of containing any number of
EFI_CERT_X509_SHA256_GUID,EFI_CERT_SHA256_GUID, andEFI_CERT_X509_GUIDentries.Currently when
EFI_CERT_X509_GUIDare contained in the dbx, the entries are skipped.This change adds support for
EFI_CERT_X509_GUIDdbx entries. When aEFI_CERT_X509_GUIDis found, it is added as an asymmetrical key to the .blacklist keyring. Anytime the .platform keyring is used, the keys in the .blacklist keyring are referenced, if a matching key is found, the key will be rejected.
Quoted 3 lines
Quoted 1 line
Signed-off-by Eric Snowberg <[email protected]>In the last paragraph, please use imperative form: "Add support for …".
I will change this in V2.
Quoted 138 lines
Quoted 138 lines
---
certs/blacklist.c | 36 +++++++++++++++++++ certs/system_keyring.c | 6 ++++ include/keys/system_keyring.h | 11 ++++++ .../platform_certs/keyring_handler.c | 11 ++++++ 4 files changed, 64 insertions(+)certs/blacklist.c +36
-0@@ -15,6 +15,7 @@#include <linux/err.h> #include <linux/seq_file.h> #include <keys/system_keyring.h> +#include <crypto/pkcs7.h> #include "blacklist.h" static struct key *blacklist_keyring;@@ -100,6 +101,41 @@ int mark_hash_blacklisted(const char *hash)return 0 ; } +int mark_key_revocationlisted (const char *data,size_t size) +{ +key_ref_t key; + + key =key_create_or_update (make_key_ref (blacklist_keyring, true), +"asymmetric" , +NULL , + data, + size, + ((KEY_POS_ALL & ~KEY_POS_SETATTR ) | +KEY_USR_VIEW ), +KEY_ALLOC_NOT_IN_QUOTA | +KEY_ALLOC_BUILT_IN ); + +if (IS_ERR (key)) { +pr_err ("Problem with revocation key (%ld)\n" ,PTR_ERR (key)); +return PTR_ERR (key); + } + +return 0 ; +} + +int is_key_revocationlisted (struct pkcs7_message *pkcs7) +{ +int ret; + + ret =pkcs7_validate_trust (pkcs7, blacklist_keyring); + +if (ret ==0 ) +return -EKEYREJECTED ; + +return -ENOKEY ; +} +EXPORT_SYMBOL_GPL (is_key_revocationlisted); +/** * is_hash_blacklisted - Determine if a hash is blacklisted * @hash: The hash to be checked as a binary blob certs/system_keyring.c +6
-0@@ -241,6 +241,12 @@ int verify_pkcs7_message_sig(const void *data, size_t len,pr_devel ("PKCS#7 platform keyring is not available\n" ); goto error; } + + ret =is_key_revocationlisted (pkcs7); +if (ret != -ENOKEY ) { +pr_devel ("PKCS#7 platform key revocationlisted\n" ); + goto error; + } } ret =pkcs7_validate_trust (pkcs7, trusted_keys);if (ret <0 ) {include/keys/system_keyring.h +11
-0@@ -31,11 +31,14 @@ extern int restrict_link_by_builtin_and_secondary_trusted(#define restrict_link_by_builtin_and_secondary_trusted restrict_link_by_builtin_trusted#endif +extern struct pkcs7_message *pkcs7;#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING extern int mark_hash_blacklisted (const char *hash); +extern int mark_key_revocationlisted (const char *data,size_t size);extern int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type);extern int is_binary_blacklisted (const u8 *hash,size_t hash_len); +extern int is_key_revocationlisted (struct pkcs7_message *pkcs7);#else static inline int is_hash_blacklisted (const u8 *hash,size_t hash_len,const char *type)@@ -47,6 +50,14 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len) {return 0 ; } +static inline int mark_key_revocationlisted (const char *data,size_t size) +{ +return 0 ; +} +static inline int is_key_revocationlisted (struct pkcs7_message *pkcs7) +{ +return -ENOKEY ; +}#endif #ifdef CONFIG_IMA_BLACKLIST_KEYRING security/integrity/platform_certs/keyring_handler.c +10
-0@@ -55,6 +55,15 @@ static __init void uefi_blacklist_binary(const char *source,uefi_blacklist_hash (source, data, len,"bin:" ,4 ); } +/* +* Revocationlist the X509 cert +*/ +static __init void uefi_revocationlist_x509 (const char *source, +const void *data,size_t len) +{ +mark_key_revocationlisted (data, len); +} +/* * Return the appropriate handler for particular signature list types found in * the UEFI db and MokListRT tables. @@ -76,5 +85,7 @@ __init efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_type)return uefi_blacklist_x509_tbs;if (efi_guidcmp (*sig_type, efi_cert_sha256_guid) ==0 )return uefi_blacklist_binary; +if (efi_guidcmp (*sig_type, efi_cert_x509_guid) ==0 )
Quoted 8 lines
Quoted 6 lines
security/integrity/platform_certs/keyring_handler.c +1
-0+return uefi_revocationlist_x509;return 0 ; }Signature · 1 line
2.18.1I did not find anything wrong with the code change.
Thanks