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 2B89D7803D7 for ; Tue, 9 Jan 2024 08:30:10 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=jV0pwESVPJ1CB5VzAutgdIGpgOheikcEZf0qkBXn+1E=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1704789008; v=1; b=QzUqqvFLCmbuIrW/2BVD1N/r6wjR0XfM61/tQoJMeC9jK08qRZwW8MqlA4+BYlUu2q4sLzDj 7ESA8xzaeWr/SyKm1ExkUPJlxseH/iOP2JdIl6puL+vlDRWPglAoNVjcBLbDJraBefNQVOq3X6T ASSsZIilC45RTyuxO4XtgS9Q= X-Received: by 127.0.0.2 with SMTP id KhbEYY7687511xGtzkSpGADZ; Tue, 09 Jan 2024 00:30:08 -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.web10.12506.1704789008138543776 for ; Tue, 09 Jan 2024 00:30:08 -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-207-_dO6HWn0MfCTEJpcCJGGyw-1; Tue, 09 Jan 2024 03:30:03 -0500 X-MC-Unique: _dO6HWn0MfCTEJpcCJGGyw-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 A91E1101A52A; Tue, 9 Jan 2024 08:30:02 +0000 (UTC) X-Received: from [10.39.193.97] (unknown [10.39.193.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A59C92026D66; Tue, 9 Jan 2024 08:30:01 +0000 (UTC) Message-ID: Date: Tue, 9 Jan 2024 09:30:00 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v4 2/3] OvmfPkg/VirtNorFlashDxe: stop accepting gEfiVariableGuid To: Gerd Hoffmann , devel@edk2.groups.io Cc: oliver@redhat.com, Jiewen Yao , Ard Biesheuvel , Sunil V L , Andrei Warkentin References: <20240108192123.42359-1-kraxel@redhat.com> <20240108192123.42359-3-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240108192123.42359-3-kraxel@redhat.com> 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 Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: pLnyr7koF0eNWJJNzEZUT0H5x7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=QzUqqvFL; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 1/8/24 20:21, Gerd Hoffmann wrote: > Only accept gEfiAuthenticatedVariableGuid when checking the variable > store header in ValidateFvHeader(). > > The edk2 code base has been switched to use the authenticated varstore > format unconditionally (even in case secure boot is not used or > supported) a few years ago. > > Suggested-by: László Érsek > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c > index 5ee98e9b595a..9a614ae4b24d 100644 > --- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c > +++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c > @@ -239,9 +239,7 @@ ValidateFvHeader ( > VariableStoreHeader = (VARIABLE_STORE_HEADER *)((UINTN)FwVolHeader + FwVolHeader->HeaderLength); > > // Check the Variable Store Guid > - if (!CompareGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid) && > - !CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid)) > - { > + if (!CompareGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid)) { > DEBUG (( > DEBUG_INFO, > "%a: Variable Store Guid non-compatible\n", Reviewed-by: Laszlo Ersek -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113432): https://edk2.groups.io/g/devel/message/113432 Mute This Topic: https://groups.io/mt/103605076/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-