mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
0350785b0a
-----BEGIN PGP SIGNATURE-----
iIoEABYIADIWIQQdXVVFGN5XqKr1Hj7LwZzRsCrn5QUCYo0tOhQcem9oYXJAbGlu
dXguaWJtLmNvbQAKCRDLwZzRsCrn5QJfAP47Ym9vacLc1m8/MUaRA/QjbJ/8t3TX
h/4McK8kiRudxgD/RiPHII6gJ8q+qpBrYWJZ4ZZaHE8v0oA1viuZfbuN2wc=
=KQYi
-----END PGP SIGNATURE-----
Merge tag 'integrity-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull IMA updates from Mimi Zohar:
"New is IMA support for including fs-verity file digests and signatures
in the IMA measurement list as well as verifying the fs-verity file
digest based signatures, both based on policy.
In addition, are two bug fixes:
- avoid reading UEFI variables, which cause a page fault, on Apple
Macs with T2 chips.
- remove the original "ima" template Kconfig option to address a boot
command line ordering issue.
The rest is a mixture of code/documentation cleanup"
* tag 'integrity-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
integrity: Fix sparse warnings in keyring_handler
evm: Clean up some variables
evm: Return INTEGRITY_PASS for enum integrity_status value '0'
efi: Do not import certificates from UEFI Secure Boot for T2 Macs
fsverity: update the documentation
ima: support fs-verity file digest based version 3 signatures
ima: permit fsverity's file digests in the IMA measurement list
ima: define a new template field named 'd-ngv2' and templates
fs-verity: define a function to return the integrity protected file digest
ima: use IMA default hash algorithm for integrity violations
ima: fix 'd-ng' comments and documentation
ima: remove the IMA_TEMPLATE Kconfig option
ima: remove redundant initialization of pointer 'file'.
85 lines
2.3 KiB
C
85 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"
|
|
#include "keyring_handler.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 an X509 TBS hash.
|
|
*/
|
|
static __init void uefi_blacklist_x509_tbs(const char *source,
|
|
const void *data, size_t len)
|
|
{
|
|
mark_hash_blacklisted(data, len, BLACKLIST_HASH_X509_TBS);
|
|
}
|
|
|
|
/*
|
|
* Blacklist the hash of an executable.
|
|
*/
|
|
static __init void uefi_blacklist_binary(const char *source,
|
|
const void *data, size_t len)
|
|
{
|
|
mark_hash_blacklisted(data, len, BLACKLIST_HASH_BINARY);
|
|
}
|
|
|
|
/*
|
|
* 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 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 NULL;
|
|
}
|
|
|
|
/*
|
|
* Return the appropriate handler for particular signature list types found in
|
|
* the MokListRT tables.
|
|
*/
|
|
__init efi_element_handler_t get_handler_for_mok(const efi_guid_t *sig_type)
|
|
{
|
|
if (efi_guidcmp(*sig_type, efi_cert_x509_guid) == 0) {
|
|
if (IS_ENABLED(CONFIG_INTEGRITY_MACHINE_KEYRING) && trust_moklist())
|
|
return add_to_machine_keyring;
|
|
else
|
|
return add_to_platform_keyring;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* 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 NULL;
|
|
}
|