diff --git a/2002-efi-Correct-Macmini-capitalisation-in-uefi-cert-quir.patch b/2002-efi-Correct-Macmini-capitalisation-in-uefi-cert-quir.patch new file mode 100644 index 0000000..c7526e5 --- /dev/null +++ b/2002-efi-Correct-Macmini-capitalisation-in-uefi-cert-quir.patch @@ -0,0 +1,53 @@ +From fba7ac96a147fccf0114922a559cb3d738b02ccb Mon Sep 17 00:00:00 2001 +From: Orlando Chamberlain +Date: Sat, 6 Aug 2022 12:49:40 +1000 +Subject: [PATCH 1/1] efi: Correct Macmini capitalisation in uefi cert quirk + +It turns out Apple doesn't capitalise the "mini" in "Macmini", which is +inconsistent with other model line names. + +Correct the capitalisation of Macmini in the quirk for skipping loading +platform certs on T2 Macs. + +Currently users get: + +------------[ cut here ]------------ +[Firmware Bug]: Page fault caused by firmware at PA: 0xffffa30640054000 +WARNING: CPU: 1 PID: 8 at arch/x86/platform/efi/quirks.c:735 efi_crash_gracefully_on_page_fault+0x55/0xe0 +Modules linked in: +CPU: 1 PID: 8 Comm: kworker/u12:0 Not tainted 5.18.14-arch1-2-t2 #1 4535eb3fc40fd08edab32a509fbf4c9bc52d111e +Hardware name: Apple Inc. Macmini8,1/Mac-7BA5B2DFE22DDD8C, BIOS 1731.120.10.0.0 (iBridge: 19.16.15071.0.0,0) 04/24/2022 +Workqueue: efi_rts_wq efi_call_rts +... +---[ end trace 0000000000000000 ]--- +efi: Froze efi_rts_wq and disabled EFI Runtime Services +integrity: Couldn't get size: 0x8000000000000015 +integrity: MODSIGN: Couldn't get UEFI db list +efi: EFI Runtime Services are disabled! +integrity: Couldn't get size: 0x8000000000000015 +integrity: Couldn't get UEFI dbx list + +Fixes: 155ca952c7ca ("efi: Do not import certificates from UEFI Secure Boot for T2 Macs") +Cc: stable@vger.kernel.org +Cc: Aditya Garg +Signed-off-by: Orlando Chamberlain +--- + security/integrity/platform_certs/load_uefi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c +index 093894a640dc..b78753d27d8e 100644 +--- a/security/integrity/platform_certs/load_uefi.c ++++ b/security/integrity/platform_certs/load_uefi.c +@@ -31,7 +31,7 @@ static const struct dmi_system_id uefi_skip_cert[] = { + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir8,1") }, + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir8,2") }, + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir9,1") }, +- { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacMini8,1") }, ++ { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "Macmini8,1") }, + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacPro7,1") }, + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,1") }, + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,2") }, +-- +2.37.1 +