-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00067.html Though upstream consider this patch could reduce the attack surface, fonts in deepin are generated with dde-api/adjust-grub-theme. It's not possible to verify fonts unless keys are generated locally.
- Loading branch information
1 parent
f512098
commit c0981d3
Showing
3 changed files
with
63 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
grub2 (2.12-1deepin5) unstable; urgency=medium | ||
|
||
* Disable verification of font files. | ||
Revert https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00067.html. | ||
|
||
-- Tianyu Chen <[email protected]> Mon, 25 Mar 2024 21:35:13 +0800 | ||
|
||
grub2 (2.12-1deepin4) unstable; urgency=medium | ||
|
||
* Do not use fwsetup --is-supported. | ||
|
54 changes: 54 additions & 0 deletions
54
debian/patches/kern-efi-sb-Enforce-verification-of-font-files.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
From 93a786a00163e50c29f0394df198518617e1c9a5 Mon Sep 17 00:00:00 2001 | ||
From: Zhang Boyang <[email protected]> | ||
Date: Sun, 14 Aug 2022 15:51:54 +0800 | ||
Subject: [PATCH] kern/efi/sb: Enforce verification of font files | ||
|
||
As a mitigation and hardening measure enforce verification of font | ||
files. Then only trusted font files can be load. This will reduce the | ||
attack surface at cost of losing the ability of end-users to customize | ||
fonts if e.g. UEFI Secure Boot is enabled. Vendors can always customize | ||
fonts because they have ability to pack fonts into their GRUB bundles. | ||
|
||
This goal is achieved by: | ||
|
||
* Removing GRUB_FILE_TYPE_FONT from shim lock verifier's | ||
skip-verification list. | ||
|
||
* Adding GRUB_FILE_TYPE_FONT to lockdown verifier's defer-auth list, | ||
so font files must be verified by a verifier before they can be loaded. | ||
|
||
Suggested-by: Daniel Kiper <[email protected]> | ||
Signed-off-by: Zhang Boyang <[email protected]> | ||
Reviewed-by: Daniel Kiper <[email protected]> | ||
--- | ||
grub-core/kern/efi/sb.c | 1 - | ||
grub-core/kern/lockdown.c | 1 + | ||
2 files changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c | ||
index 89c4bb3fd..db42c2539 100644 | ||
--- a/grub-core/kern/efi/sb.c | ||
+++ b/grub-core/kern/efi/sb.c | ||
@@ -145,6 +145,7 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), | ||
case GRUB_FILE_TYPE_PRINT_BLOCKLIST: | ||
case GRUB_FILE_TYPE_TESTLOAD: | ||
case GRUB_FILE_TYPE_GET_SIZE: | ||
+ case GRUB_FILE_TYPE_FONT: | ||
case GRUB_FILE_TYPE_ZFS_ENCRYPTION_KEY: | ||
case GRUB_FILE_TYPE_CAT: | ||
case GRUB_FILE_TYPE_HEXCAT: | ||
diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c | ||
index 0bc70fd42..af6d493cd 100644 | ||
--- a/grub-core/kern/lockdown.c | ||
+++ b/grub-core/kern/lockdown.c | ||
@@ -51,7 +51,6 @@ lockdown_verifier_init (grub_file_t io __attribute__ ((unused)), | ||
case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE: | ||
case GRUB_FILE_TYPE_ACPI_TABLE: | ||
case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: | ||
- case GRUB_FILE_TYPE_FONT: | ||
*flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; | ||
|
||
/* Fall through. */ | ||
-- | ||
2.33.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters