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 3CF0ED8119E for ; Fri, 22 Mar 2024 14:28:05 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=SIfZ73rZXVhPloNsIOlA+nfbWnyolUBJR/mh/hNiro8=; 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:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20240206; t=1711117683; v=1; b=ZARzGYmqNs5nj/7HILwQVCxJ01TuGHRVYB22ckyywaBgeYqUCqmm1tdPwLG/FDZMZ5rJtwJ+ aJbIoih/Q6L7mkBueqtPmnILiPhQPG+ikl2JxtnBOyU4Hr0WcaCPaJm0ZMzaRcSL/11YLun5QQ+ rXLxzbfF8Wi0QzRvYH4oszqIYcaanNgp3QiuD54lykZr2b4O/wMOvFWAyKv3092UliTBAPEXHMu EhcYY+b2tD+THZeRFmnn9RxZXIySHmDvrdEeytKMGilDdoMhf73mqg6FT//rue0M9WuQnL8QNtx ktNeLVqAGMPqWxa35TRgABAMhP6ObVfY2FXhH2DT3bXIw== X-Received: by 127.0.0.2 with SMTP id rHlfYY7687511xKLZw35tm64; Fri, 22 Mar 2024 07:28:03 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.14509.1711117683284144241 for ; Fri, 22 Mar 2024 07:28:03 -0700 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-610-wYIh5u4eMka-so75qi81pw-1; Fri, 22 Mar 2024 10:28:00 -0400 X-MC-Unique: wYIh5u4eMka-so75qi81pw-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 EFC5D101A523; Fri, 22 Mar 2024 14:27:59 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06BB12022C1D; Fri, 22 Mar 2024 14:27:59 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1407D1801ABF; Fri, 22 Mar 2024 15:27:36 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Oliver Steffen , Gerd Hoffmann , Ard Biesheuvel , Jiewen Yao , Konstantin Kostiuk Subject: [edk2-devel] [PATCH 4/4] OvmfPkg/VirtHstiDxe: add code flash check Date: Fri, 22 Mar 2024 15:27:35 +0100 Message-ID: <20240322142735.1749388-5-kraxel@redhat.com> In-Reply-To: <20240322142735.1749388-1-kraxel@redhat.com> References: <20240322142735.1749388-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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 Resent-Date: Fri, 22 Mar 2024 07:28:03 -0700 Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Lf5yNAjF7WccPTcqyk0EawCFx7686176AA= 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=20240206 header.b=ZARzGYmq; 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) Detects qemu config issue: code pflash is writable. Checked for both PC and Q35. Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Konstantin Kostiuk Signed-off-by: Gerd Hoffmann --- OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf | 2 ++ OvmfPkg/VirtHstiDxe/VirtHstiDxe.h | 13 +++++++++++ OvmfPkg/VirtHstiDxe/QemuCommon.c | 36 +++++++++++++++++++++++++++++ OvmfPkg/VirtHstiDxe/VirtHstiDxe.c | 4 ++++ 4 files changed, 55 insertions(+) create mode 100644 OvmfPkg/VirtHstiDxe/QemuCommon.c diff --git a/OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf b/OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf index 9cb2ed1f0c64..376cd28aeb7e 100644 --- a/OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf +++ b/OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf @@ -22,6 +22,7 @@ [Sources] VirtHstiDxe.c QemuPC.c QemuQ35.c + QemuCommon.c Flash.c [Packages] @@ -49,6 +50,7 @@ [FeaturePcd] [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress + gUefiOvmfPkgTokenSpaceGuid.PcdBfvBase [Depex] TRUE diff --git a/OvmfPkg/VirtHstiDxe/VirtHstiDxe.h b/OvmfPkg/VirtHstiDxe/VirtHstiDxe.h index ca4e376582ad..b915f5cdf5ac 100644 --- a/OvmfPkg/VirtHstiDxe/VirtHstiDxe.h +++ b/OvmfPkg/VirtHstiDxe/VirtHstiDxe.h @@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define VIRT_HSTI_BYTE0_Q35_SMM_SMRAM_LOCK BIT0 #define VIRT_HSTI_BYTE0_Q35_SMM_SECURE_VARS_FLASH BIT1 +#define VIRT_HSTI_BYTE0_READONLY_CODE_FLASH BIT2 typedef struct { // ADAPTER_INFO_PLATFORM_SECURITY @@ -67,6 +68,18 @@ VirtHstiQemuPCVerify ( VOID ); +/* QemuCommon.c */ + +VOID +VirtHstiQemuCommonInit ( + VIRT_ADAPTER_INFO_PLATFORM_SECURITY *VirtHsti + ); + +VOID +VirtHstiQemuCommonVerify ( + VOID + ); + /* Flash.c */ #define QEMU_FIRMWARE_FLASH_UNKNOWN 0 diff --git a/OvmfPkg/VirtHstiDxe/QemuCommon.c b/OvmfPkg/VirtHstiDxe/QemuCommon.c new file mode 100644 index 000000000000..4ab3fe2d6e63 --- /dev/null +++ b/OvmfPkg/VirtHstiDxe/QemuCommon.c @@ -0,0 +1,36 @@ +/** @file + +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include + +#include "VirtHstiDxe.h" + +VOID +VirtHstiQemuCommonInit ( + VIRT_ADAPTER_INFO_PLATFORM_SECURITY *VirtHsti + ) +{ + VirtHstiSetSupported (VirtHsti, 0, VIRT_HSTI_BYTE0_READONLY_CODE_FLASH); +} + +VOID +VirtHstiQemuCommonVerify ( + VOID + ) +{ + CHAR16 *ErrorMsg; + + switch (VirtHstiQemuFirmwareFlashCheck (PcdGet32 (PcdBfvBase))) { + case QEMU_FIRMWARE_FLASH_WRITABLE: + ErrorMsg = L"qemu code pflash is writable"; + break; + default: + ErrorMsg = NULL; + } + + VirtHstiTestResult (ErrorMsg, 0, VIRT_HSTI_BYTE0_READONLY_CODE_FLASH); +} diff --git a/OvmfPkg/VirtHstiDxe/VirtHstiDxe.c b/OvmfPkg/VirtHstiDxe/VirtHstiDxe.c index 74e5e6bd9d4f..b6e53a1219d1 100644 --- a/OvmfPkg/VirtHstiDxe/VirtHstiDxe.c +++ b/OvmfPkg/VirtHstiDxe/VirtHstiDxe.c @@ -104,9 +104,11 @@ VirtHstiOnReadyToBoot ( switch (VirtHstiGetHostBridgeDevId ()) { case INTEL_82441_DEVICE_ID: VirtHstiQemuPCVerify (); + VirtHstiQemuCommonVerify (); break; case INTEL_Q35_MCH_DEVICE_ID: VirtHstiQemuQ35Verify (); + VirtHstiQemuCommonVerify (); break; default: ASSERT (FALSE); @@ -142,9 +144,11 @@ VirtHstiDxeEntrypoint ( switch (DevId) { case INTEL_82441_DEVICE_ID: VirtHsti = VirtHstiQemuPCInit (); + VirtHstiQemuCommonInit (VirtHsti); break; case INTEL_Q35_MCH_DEVICE_ID: VirtHsti = VirtHstiQemuQ35Init (); + VirtHstiQemuCommonInit (VirtHsti); break; default: DEBUG ((DEBUG_INFO, "%a: unknown platform (0x%x)\n", __func__, DevId)); -- 2.44.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117051): https://edk2.groups.io/g/devel/message/117051 Mute This Topic: https://groups.io/mt/105086175/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-