mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-25 20:14:25 +08:00
56c5812623
This fixes CVE-2020-26541. 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. Add 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. [DH: Made the following changes: - Added to have a config option to enable the facility. This allows a Kconfig solution to make sure that pkcs7_validate_trust() is enabled.[1][2] - Moved the functions out from the middle of the blacklist functions. - Added kerneldoc comments.] Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> cc: Randy Dunlap <rdunlap@infradead.org> cc: Mickaël Salaün <mic@digikod.net> cc: Arnd Bergmann <arnd@kernel.org> cc: keyrings@vger.kernel.org Link: https://lore.kernel.org/r/20200901165143.10295-1-eric.snowberg@oracle.com/ # rfc Link: https://lore.kernel.org/r/20200909172736.73003-1-eric.snowberg@oracle.com/ # v2 Link: https://lore.kernel.org/r/20200911182230.62266-1-eric.snowberg@oracle.com/ # v3 Link: https://lore.kernel.org/r/20200916004927.64276-1-eric.snowberg@oracle.com/ # v4 Link: https://lore.kernel.org/r/20210122181054.32635-2-eric.snowberg@oracle.com/ # v5 Link: https://lore.kernel.org/r/161428672051.677100.11064981943343605138.stgit@warthog.procyon.org.uk/ Link: https://lore.kernel.org/r/161433310942.902181.4901864302675874242.stgit@warthog.procyon.org.uk/ # v2 Link: https://lore.kernel.org/r/161529605075.163428.14625520893961300757.stgit@warthog.procyon.org.uk/ # v3 Link: https://lore.kernel.org/r/bc2c24e3-ed68-2521-0bf4-a1f6be4a895d@infradead.org/ [1] Link: https://lore.kernel.org/r/20210225125638.1841436-1-arnd@kernel.org/ [2]
92 lines
2.3 KiB
C
92 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/cred.h>
|
|
#include <linux/err.h>
|
|
#include <linux/efi.h>
|
|
#include <linux/slab.h>
|
|
#include <keys/asymmetric-type.h>
|
|
#include <keys/system_keyring.h>
|
|
#include "../integrity.h"
|
|
|
|
static efi_guid_t efi_cert_x509_guid __initdata = EFI_CERT_X509_GUID;
|
|
static efi_guid_t efi_cert_x509_sha256_guid __initdata =
|
|
EFI_CERT_X509_SHA256_GUID;
|
|
static efi_guid_t efi_cert_sha256_guid __initdata = EFI_CERT_SHA256_GUID;
|
|
|
|
/*
|
|
* Blacklist a hash.
|
|
*/
|
|
static __init void uefi_blacklist_hash(const char *source, const void *data,
|
|
size_t len, const char *type,
|
|
size_t type_len)
|
|
{
|
|
char *hash, *p;
|
|
|
|
hash = kmalloc(type_len + len * 2 + 1, GFP_KERNEL);
|
|
if (!hash)
|
|
return;
|
|
p = memcpy(hash, type, type_len);
|
|
p += type_len;
|
|
bin2hex(p, data, len);
|
|
p += len * 2;
|
|
*p = 0;
|
|
|
|
mark_hash_blacklisted(hash);
|
|
kfree(hash);
|
|
}
|
|
|
|
/*
|
|
* Blacklist an X509 TBS hash.
|
|
*/
|
|
static __init void uefi_blacklist_x509_tbs(const char *source,
|
|
const void *data, size_t len)
|
|
{
|
|
uefi_blacklist_hash(source, data, len, "tbs:", 4);
|
|
}
|
|
|
|
/*
|
|
* Blacklist the hash of an executable.
|
|
*/
|
|
static __init void uefi_blacklist_binary(const char *source,
|
|
const void *data, size_t len)
|
|
{
|
|
uefi_blacklist_hash(source, data, len, "bin:", 4);
|
|
}
|
|
|
|
/*
|
|
* Add an X509 cert to the revocation list.
|
|
*/
|
|
static __init void uefi_revocation_list_x509(const char *source,
|
|
const void *data, size_t len)
|
|
{
|
|
add_key_to_revocation_list(data, len);
|
|
}
|
|
|
|
/*
|
|
* Return the appropriate handler for particular signature list types found in
|
|
* the UEFI db and MokListRT tables.
|
|
*/
|
|
__init efi_element_handler_t get_handler_for_db(const efi_guid_t *sig_type)
|
|
{
|
|
if (efi_guidcmp(*sig_type, efi_cert_x509_guid) == 0)
|
|
return add_to_platform_keyring;
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Return the appropriate handler for particular signature list types found in
|
|
* the UEFI dbx and MokListXRT tables.
|
|
*/
|
|
__init efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_type)
|
|
{
|
|
if (efi_guidcmp(*sig_type, efi_cert_x509_sha256_guid) == 0)
|
|
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_revocation_list_x509;
|
|
return 0;
|
|
}
|