qiurui
/
Ubuntu-focal-kernel
mirror of https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBUNTU: SAUCE: integrity: add informational messages when revoking certs 

integrity_load_cert() prints messages of the source and cert details
when adding certs as trusted. Mirror those messages in
uefi_revocation_list_x509() when adding certs as revoked.

Sample dmesg with this change:

    integrity: Platform Keyring initialized
    integrity: Loading X.509 certificate: UEFI:db
    integrity: Loaded X.509 cert 'Microsoft Corporation UEFI CA 2011: 13adbf4309bd82709c8cd54f316ed522988a1bd4'
    integrity: Revoking X.509 certificate: UEFI:MokListXRT (MOKvar table)
    blacklist: Revoked X.509 cert 'Canonical Ltd. Secure Boot Signing: 61482aa2830d0ab2ad5af10b7250da9033ddcef0'
    integrity: Loading X.509 certificate: UEFI:MokListRT (MOKvar table)
    integrity: Loaded X.509 cert 'Canonical Ltd. Master Certificate Authority: ad91990bc22ab1f517048c23b6655a268e345a63'

BugLink: https://bugs.launchpad.net/bugs/1928679
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
This commit is contained in:
Dimitri John Ledkov 2021-05-18 10:56:42 +01:00 committed by Andrea Righi
parent a9e3aae162
commit ba9fb788f8
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
certs/blacklist.c
View File

@ -172,6 +172,9 @@ int add_key_to_revocation_list(const char *data, size_t size)
if (IS_ERR(key)) { if (IS_ERR(key)) {
pr_err("Problem with revocation key (%ld)\n", PTR_ERR(key)); pr_err("Problem with revocation key (%ld)\n", PTR_ERR(key));
return PTR_ERR(key); return PTR_ERR(key);
} else {
pr_notice("Revoked X.509 cert '%s'\n",
key_ref_to_ptr(key)->description);
} }
return 0; return 0;

1
security/integrity/platform_certs/keyring_handler.c
View File

@ -61,6 +61,7 @@ static __init void uefi_blacklist_binary(const char *source,
static __init void uefi_revocation_list_x509(const char *source, static __init void uefi_revocation_list_x509(const char *source,
const void *data, size_t len) const void *data, size_t len)
{ {
pr_info("Revoking X.509 certificate: %s\n", source);
add_key_to_revocation_list(data, len); add_key_to_revocation_list(data, len);
} }