Message ID | 20221013175148.267880948@linuxfoundation.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405993wrs; Thu, 13 Oct 2022 10:59:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4F5TwRaQX4Enig+MnKJLKIBNxfRftEs290O/fvj/13jmGNjYREhqIOUaS2y+kMLef8hRxB X-Received: by 2002:a05:6402:440d:b0:450:de54:3fcf with SMTP id y13-20020a056402440d00b00450de543fcfmr833357eda.312.1665683976989; Thu, 13 Oct 2022 10:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683976; cv=none; d=google.com; s=arc-20160816; b=LBQXsXBJB98Y/aqIQviExjVW3SxY+FXNdtT6sXCu/xmjXwiDT2YQX4tVnNENCSqZC4 URl3c4QuLjHhutm+t8ibfR1gP1N7hRy65efpHui3gq5aCpvv9NI9Fi8SfGo4q3Q50191 jr/K7JWnPE/em8VC3oGri6RHr+gOcvq+bGDWnAoq0OTZC5IyLdO+ZXJ2S5kTphkYebmh wU8sG58V1TR+2qYwCjHhdpzmAMflX1EIXG24w2efoplZ2hACDsWSScCRQI8T64Ryp5qA 1NUdlHTH1dJs6DgyM68UcUUlgHqmZEOecC+c3c4ujBpZkZsbqlLR8ClSjre/bJtFeQMf ih+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GQHBuiutrtStC6ceZygwsbSmjMEFY7gOuWdC36dWwLk=; b=My0lefHaUuA9y/maeOG8EEzxm0IowipcxEJthoUXjsofi1h6OmoSeADSB2ch9Ip3EX 4G1xNbPX/pEg1XAN1zpz2rfw/qEKAimyauNY7TSohKWYTKWLQpEu1MvPgK7ucMRQiYEm 6kBPvOYXQ68IIOxGfSrU0akTz9hdaRclmb3V1qrNGD60Y1dybItW7va8rjzWwV1i5Gu3 g7mT1xKz113Rajm2gTyK44h/kqb9UCkRB14Er+LYYEG1LKeEi1c5g4UgqiB/wRR723U+ 6/9AhbWVQi7Ik0M/Mac0oDtlli0PMoRneopeBMkT6pVpWeN7D++KGKeX2THkffi/MoG8 pBIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s8LW1WnW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oz38-20020a1709077da600b0074171cca419si280524ejc.892.2022.10.13.10.59.00; Thu, 13 Oct 2022 10:59:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=s8LW1WnW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230256AbiJMR6e (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Thu, 13 Oct 2022 13:58:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230132AbiJMR5a (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 13 Oct 2022 13:57:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 352BDB03CC; Thu, 13 Oct 2022 10:56:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 83EB0B8203C; Thu, 13 Oct 2022 17:55:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4D40C433D6; Thu, 13 Oct 2022 17:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683755; bh=OEVHSmyP6ry9HP1rzqnCniac1P21E4uC7zWTb3gHzHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s8LW1WnWuqRYxOlHgbLE9iqEyCx6EEclvRN0cBz2PznacPzNvbKN4BDqWXv/vrNWW kGhmksUqhXzAVB6RxJp2pRDRrbotwiSo4UV1GEAS7tH6o2P7o5xkrSFzB1e70AI8bK abLj5Atl9gx52qONQ+2v3jmr8zq/i5OjOfBr8EzQ= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Aditya Garg <gargaditya08@live.com>, Samuel Jiang <chyishian.jiang@gmail.com>, Orlando Chamberlain <redecorating@protonmail.com>, Mimi Zohar <zohar@linux.ibm.com> Subject: [PATCH 5.10 38/54] efi: Correct Macmini DMI match in uefi cert quirk Date: Thu, 13 Oct 2022 19:52:32 +0200 Message-Id: <20221013175148.267880948@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596241652657867?= X-GMAIL-MSGID: =?utf-8?q?1746596241652657867?= |
Series |
None
|
|
Commit Message
Greg KH
Oct. 13, 2022, 5:52 p.m. UTC
From: Orlando Chamberlain <redecorating@protonmail.com> commit bab715bdaa9ebf28d99a6d1efb2704a30125e96d upstream. It turns out Apple doesn't capitalise the "mini" in "Macmini" in DMI, 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 <gargaditya08@live.com> Tested-by: Samuel Jiang <chyishian.jiang@gmail.com> Signed-off-by: Orlando Chamberlain <redecorating@protonmail.com> Signed-off-by: Mimi Zohar <zohar@linux.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- security/integrity/platform_certs/load_uefi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c @@ -30,7 +30,7 @@ static const struct dmi_system_id uefi_s { 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") },