From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 5FDD1D811CA for ; Thu, 22 Feb 2024 10:14:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=+QbHUIvJ5oIDv2Tsj0/6MGzlDfCgKqe49DsHYow1jeo=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1708596856; v=1; b=r5UrqwGv1gAJbeG7LwedwQqC+ai6CO8Lr6IS1SleBpGMZsMbMYLsqpMmieMXMLQYMiD5cDz8 k0BLKwF2zzd4M7ojJTFIxoUY1yQj3+GntAi99Yk8yHpJUBlYVUYMM9yBsvGfMC5oZPGUwifFZdS o3mwW8ChUdP9sVhR9Fzzd+b4= X-Received: by 127.0.0.2 with SMTP id o1ZcYY7687511xWIrwR9dgcI; Thu, 22 Feb 2024 02:14:16 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.9751.1708596854305331979 for ; Thu, 22 Feb 2024 02:14:14 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-451-PUgwoK3PO2-t71XCbBOi4g-1; Thu, 22 Feb 2024 05:14:10 -0500 X-MC-Unique: PUgwoK3PO2-t71XCbBOi4g-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F6DB85A58F; Thu, 22 Feb 2024 10:14:09 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.237]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4368D8CED; Thu, 22 Feb 2024 10:14:09 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B7F3E1802C2D; Thu, 22 Feb 2024 11:13:58 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael Roth , Laszlo Ersek , Tom Lendacky , Min Xu , Jiewen Yao , Gerd Hoffmann , Ard Biesheuvel , Erdem Aktas , Oliver Steffen , Jiewen Yao Subject: [edk2-devel] [PATCH v3 12/12] OvmfPkg: only add shell to FV in case secure boot is disabled Date: Thu, 22 Feb 2024 11:13:58 +0100 Message-ID: <20240222101358.67818-13-kraxel@redhat.com> In-Reply-To: <20240222101358.67818-1-kraxel@redhat.com> References: <20240222101358.67818-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: nUy8zQV8blXVNYFIQuKJpABsx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=r5UrqwGv; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) The EFI Shell allows to bypass secure boot, do not allow to include the shell in the firmware images of secure boot enabled builds. This prevents misconfigured downstream builds. Ref: https://bugs.launchpad.net/ubuntu/+source/edk2/+bug/2040137 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4641 Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Acked-by: Jiewen Yao --- OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc index 3081ac41780a..38f69747b02c 100644 --- a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(BUILD_SHELL) == TRUE +!if $(BUILD_SHELL) == TRUE && $(SECURE_BOOT_ENABLE) == FALSE !if $(TOOL_CHAIN_TAG) != "XCODE5" !if $(NETWORK_ENABLE) == TRUE -- 2.43.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115794): https://edk2.groups.io/g/devel/message/115794 Mute This Topic: https://groups.io/mt/104505816/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-