From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E77F447819 for ; Fri, 24 Jul 2026 16:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784911637; cv=none; b=lxfcMsooadLCbbZe9UnYRjCIWYuqAlOniAm4zcJnYqgd9PLfk2a/TVx+NEO85Mnc+gvYwnZYhgZYXorTvgAWzxJ5jUsjH+vNO5mtNVSxDjSVyPHqewE2QDX9XbqgfI84feqzXHC6LeBktSAOhpAeR52Og3dx1auYFU3k5TgGC/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784911637; c=relaxed/simple; bh=G9P3Gm9X6VHormYF4PiT6UNlB1syHT2Cmg6ZgiMV8f8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vd47Yxniq4SX+u0Ip1fGk1SsmkewgdkWBZG0kF+U59LPDksbcg71Ai7sxhJeFuFVbOqsFoMmXU3wGAVJag/iWok1ce2gTMfWarUTShjbI/W29DmBjKtQe/YDrjhIckFM2GuyVljmq3oB9qmPWs3iA52wt95eejmg4f0BXvd/ekc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iRrw6Q4b; arc=none smtp.client-ip=209.85.215.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iRrw6Q4b" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-c998fd549a8so463259a12.2 for ; Fri, 24 Jul 2026 09:47:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784911635; x=1785516435; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/e05uQAC/MWsadOTV5ro3O8ihJOAfbb/VcbPjWI2HCQ=; b=iRrw6Q4bSwBbm6cKa1fCN5eiEk4eHlgfu5ckNMHz1kGP82RVW8WGEszLaVfrBpEzVW xkuKb9oI6F7XaWrDnYOIO0+6MiGCJXOwgV3EHUUp/OiSCV7oD+mD+uAHF/ySK/D0vuB3 CIkV/zDSo9HbgL+LMqYUB7jJKg/ADRDO4MnPN2FEE79B83XI/gMNMNHjxFp0mQQhWHIp 2ro7mnQLlbI5AsDOhFGMmj3fiNlvEiYHiG3TPbPcgsqyPxQ1hZw+hi60iM8Z7BqmAiR4 s3aSfADTRWKQUQw3R5pVqqbjWAAYrvNgNktAMSVgT20fU75G9f2/Wqo3N1TTg9g9ubBN px1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784911635; x=1785516435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=/e05uQAC/MWsadOTV5ro3O8ihJOAfbb/VcbPjWI2HCQ=; b=msdVeo3ftx8YFTLfjN1DnLshn1+4aFsVrnGb7VjzuYhExAemcxc0aVhnMZChQxfgrq U0DsdhR4DlhnEzYNq9JposBeUEBlHDKwTuioq+95od1LIB72csqDA1aMAuyHjk5mBkB/ 1ZVXPDxQ+NaO2jT2L2IZrOaCQ6HeIgL3T+jkleAi7f9ozujgtSL3EGyKNslX1xaKpR2S pGe3AaQeyT9aPs+SpPwq37DWsiw2XFGwk+Vg+08NWIIxXhijw72Fea9LI57KSQyfJwkg L4yuY/xeEM+Wcij7Vmm6OHlIXcYIsskRb/KTJr1Z/4XAWUTd+vyO4DWJOgEvppc09a7p zk7Q== X-Forwarded-Encrypted: i=1; AHgh+Roh7fq70vP92Dfc2jy5EigUQvnEtdbJnJo4Xr9ph0yVL023jWUde3RqMj14ruAJUKv1vJSSp2rXrC3vVGI=@vger.kernel.org X-Gm-Message-State: AOJu0Ywo09ORxlTcxAVjG4Nm0kcxB81lpOqTD+06qIUJ8j+UE9KN+8da +IDMp1d58CfndjST/6uN7iIGXdzx+yemJ+/vAc2q3J+OO8G3915bXvE= X-Gm-Gg: AR+sD12DIQTCDW3dpagxoeWrmFfq7am3n6VpkLJE5eGjQW9Y9FB4e8Tfg/iOmkMTDht 20bJR86bRmcZjx7K7VcEXPr8hbk87rS3scFcyOql5r4hnDDnpW8sBoSaidzg87lrlWdQXZgQnpl pW32BTWRET5j8+mHz0J1Gec5UD8fo41Q50u3aeVqvEDGzHCUewtkEJqGcVOkiZylgMB8n2y4Qe0 WPANw8eSEw1bc68Rj6iQ+eNL5siqvM/JAwebSVz7vYPocHQrP3+Z7ysLS45e/A7iFp76AsskcUy gioUD1A/rGf4jdkU5xolWzHEUsIsmvK11MeAysq8ihp9JGz0KGsvfe28V5xXUK3Nr7sTnq3z96D vFhsiTsDZcKbUgCxXTbtMmOx5Z6m7sXMJisBgq3b7sJvVahQFC2A0+LJ/zdZAOOQDR5E8tlmX26 VM0dBa60S2zbhuvparamURW8Efj3KMdtd88vhOOg== X-Received: by 2002:a05:6a20:e20e:b0:3b2:a809:1000 with SMTP id adf61e73a8af0-3c44afa7acbmr9700455637.3.1784911634484; Fri, 24 Jul 2026 09:47:14 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009.. ([27.60.19.161]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-314bc548e29sm918244eec.15.2026.07.24.09.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 09:47:13 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andreas Noever , Mika Westerberg , Yehezkel Bernat , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Jarkko Sakkinen , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Paul Moore , James Morris , "Serge E. Hallyn" , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v4 1/2] treewide: Add a flag to detect the Apple T2 chip Date: Fri, 24 Jul 2026 12:46:36 -0400 Message-ID: <20260724164641.2239-2-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260724164641.2239-1-atharvatiwarilinuxdev@gmail.com> References: <20260724164641.2239-1-atharvatiwarilinuxdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a flag to detect Apple T2 chips on Intel Macs. Cache the result to avoid repeated checks. That will be used in upcoming patches. Signed-off-by: Atharva Tiwari --- arch/x86/kernel/quirks.c | 37 ++++++++++++++++++ include/linux/platform_data/x86/apple.h | 5 +++ .../platform_certs/keyring_handler.h | 8 ---- security/integrity/platform_certs/load_uefi.c | 38 ++++--------------- 4 files changed, 50 insertions(+), 38 deletions(-) diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index a92f18db9610..6651e5d4d106 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -664,8 +664,45 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2083, quirk_intel_purley_xeon_ras bool x86_apple_machine; EXPORT_SYMBOL(x86_apple_machine); +bool has_apple_t2_chip; +EXPORT_SYMBOL(has_apple_t2_chip); + +static const char * const __initconst apple_t2_models[] = { + "MacBookPro15,1", + "MacBookPro15,2", + "MacBookPro15,3", + "MacBookPro15,4", + "MacBookPro16,1", + "MacBookPro16,2", + "MacBookPro16,3", + "MacBookPro16,4", + "MacBookAir8,1", + "MacBookAir8,2", + "MacBookAir9,1", + "Macmini8,1", + "MacPro7,1", + "iMac20,1", + "iMac20,2", + "iMacPro1,1", +}; + void __init early_platform_quirks(void) { x86_apple_machine = dmi_match(DMI_SYS_VENDOR, "Apple Inc.") || dmi_match(DMI_SYS_VENDOR, "Apple Computer, Inc."); + + if (x86_apple_machine) { + const char *product_name = dmi_get_system_info(DMI_PRODUCT_NAME); + int i; + + if (!product_name) + return; + + for (i = 0; i < ARRAY_SIZE(apple_t2_models); i++) { + if (!strcmp(product_name, apple_t2_models[i])) { + has_apple_t2_chip = true; + break; + } + } + } } diff --git a/include/linux/platform_data/x86/apple.h b/include/linux/platform_data/x86/apple.h index 079e816c3c21..47b27dceab18 100644 --- a/include/linux/platform_data/x86/apple.h +++ b/include/linux/platform_data/x86/apple.h @@ -6,8 +6,13 @@ * x86_apple_machine - whether the machine is an x86 Apple Macintosh */ extern bool x86_apple_machine; +/** + * has_apple_t2_chip - whether the machine has the Apple T2 chip + */ +extern bool has_apple_t2_chip; #else #define x86_apple_machine false +#define has_apple_t2_chip false #endif #endif diff --git a/security/integrity/platform_certs/keyring_handler.h b/security/integrity/platform_certs/keyring_handler.h index f92895cc50f6..a355f4400179 100644 --- a/security/integrity/platform_certs/keyring_handler.h +++ b/security/integrity/platform_certs/keyring_handler.h @@ -45,11 +45,3 @@ efi_element_handler_t get_handler_for_code_signing_keys(const efi_guid_t *sig_ty efi_element_handler_t get_handler_for_dbx(const efi_guid_t *sig_type); #endif - -#ifndef UEFI_QUIRK_SKIP_CERT -#define UEFI_QUIRK_SKIP_CERT(vendor, product) \ - .matches = { \ - DMI_MATCH(DMI_BOARD_VENDOR, vendor), \ - DMI_MATCH(DMI_PRODUCT_NAME, product), \ - }, -#endif diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c index c0d6948446c3..b4096d4c828d 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -3,42 +3,16 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include "../integrity.h" #include "keyring_handler.h" -/* - * On T2 Macs reading the db and dbx efi variables to load UEFI Secure Boot - * certificates causes occurrence of a page fault in Apple's firmware and - * a crash disabling EFI runtime services. The following quirk skips reading - * these variables. - */ -static const struct dmi_system_id uefi_skip_cert[] = { - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,3") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro15,4") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,3") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookPro16,4") }, - { 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.", "MacPro7,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMacPro1,1") }, - { } -}; - /* * Look to see if a UEFI variable called MokIgnoreDB exists and return true if * it does. @@ -165,10 +139,14 @@ static int __init load_uefi_certs(void) unsigned long dbsize = 0, dbxsize = 0, mokxsize = 0; efi_status_t status; int rc = 0; - const struct dmi_system_id *dmi_id; - dmi_id = dmi_first_match(uefi_skip_cert); - if (dmi_id) { + /* + * On T2 Macs reading the db and dbx efi variables to load UEFI Secure Boot + * certificates causes occurrence of a page fault in Apple's firmware and + * a crash disabling EFI runtime services. The following quirk skips reading + * these variables. + */ + if (has_apple_t2_chip) { pr_err("Reading UEFI Secure Boot Certs is not supported on T2 Macs.\n"); return false; } -- 2.43.0