From nobody Tue Feb 10 02:43:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59385+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59385+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589321191; cv=none; d=zohomail.com; s=zohoarc; b=Di7xVl6TUnMK6GBd9qmqEXpThMAUqMoRMWFfYxfjhYejhnrJnQ5WaiZPY1VaAssZ5nkh1fuHy0UT3JVn+RBX2btDdbqrlqphsLbSpnuqwXsEpPsUJ2rIlZI0CYayiVfM8zO64+iBJLK0+efG3NKCAzJQawLht3h6s2Ct3V4oNDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589321191; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=hykjawlFNOtfMSq0ExLzZa1wKF2VOfLf1dS8mtNPdrw=; b=So5mD44dwvNg3LDadkQ6v9gkGZwH28kDMG0DLmve/sPW6e05IVfg7PpioSUh8+njwe7DzzAD4mltsTeNS6owzIYBYyU0j1540n6qKMRbaF2aDpSd2SqpbxjU7Wg2rgZp0RtAyMqLI0SwH6R09Nd+fuQGc3nOfeEG73Yf37a/5HM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59385+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589321191983810.6120751558493; Tue, 12 May 2020 15:06:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1yP9YY1788612x5bFgVQAGl9; Tue, 12 May 2020 15:06:31 -0700 X-Received: from atlmailgw2.ami.com (atlmailgw2.ami.com []) by mx.groups.io with SMTP id smtpd.web10.280.1589321185430648927 for ; Tue, 12 May 2020 15:06:29 -0700 X-AuditID: ac10606f-049ff70000001b62-68-5ebb1de4d504 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw2.ami.com (Symantec Messaging Gateway) with SMTP id A4.82.07010.4ED1BBE5; Tue, 12 May 2020 18:06:29 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Tue, 12 May 2020 18:05:49 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V4 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Date: Tue, 12 May 2020 18:05:43 -0400 Message-ID: <20200512220543.40008-7-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-1-oleksiyy@ami.com> References: <20200512220543.40008-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRmVeSWpSXmKPExsWyRiBhgu5T2d1xBkt+cVvMf1tt0T5hNpvF 1Vu/mCzmfZvBarHuo4fFinsb2C06Ov4xObB7bP9+gdFj8Z6XTAFMUQ2MNol5efkliSWpCimp xcm2SgFFmWWJyZVKCpkptkqGSgoFOYnJqbmpeSW2SokFBal5KUp2XAoYwAaoLDNPITUvOT8l My/dVskz2F/XwsLUUtdQyS4kI1UhMy8tvyg3sSQzP08hOT+vBKg6NQUoqpDQzZmxa1kfW0Gr SMXBZVNZGxifCXQxcnJICJhIbJ+xm6WLkYtDSGAXk8Sz1dfYIJwtjBI9W08xgVSxCWhKHDg2 hRHEFhGQkphyYCZYnFngMKNExyewuLBAkMS0Pe9ZQWwWAVWJhdOXsoPYvAKmEg+v9zNBbNOQ mLbmLpjNKWAm8e3pKbBeIaCaI49usELUC0qcnPmEBWK+hMTBFy+YIWpkJdqOP2efwMg/C0nZ LCRlCxiZVjEKJZbk5CZm5qSXG+kl5mbqJefnbmKERGD+DsaPH80PMTJxMB5ilOBgVhLhbcnc GSfEm5JYWZValB9fVJqTWnyI0QnogYnMUtygEARGSbyxgYGUKIxjaGJmYm5kbmhpYm5srCTO O2ntmjghgXRg1GanphakFsEMYeLglGpg9LLiP6pnHB1W8T/kfsVNuXzJG2zy3Ic82QO/FpSX d95edrfuiH1x1O1jnu1LIu/N3fnX1XCZgEHeZJuKrxJfP738LbA2ul775ApV5sOtomdfJ6h/ dVvOUv27lzVlbfIOBp/cvfbn2hOrfYVfZq7dvaIk4uGltXGVtncOTY5f8b80KIZv2cmPSizF GYmGWsxFxYkAoSGkWtUCAAA= Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: dvHrhP7WzpITwIVY1wLaQ8xYx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589321191; bh=zMT6m9TAn2V0EOVr9aztyyK4dEzNRpkBHY6WjEUvEmk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=lRtILk2yYD2rTjQvFd3NkmUUyGepq8r+Q/+nOfJJdC8yVD2TA1jJaM/mYYzKfKwGEYS ZStkrZcdEiwdYrZvxwfGbqu0sjHTx90ovfTAkA3hJeHihlkOzj0ldboW/PT2oKplD/Wgk JBV8higXW5wNUJFs6M/LclbEVNKR7CcoAC0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add bitmask to structure which gives a binary-inspectable mechanism to determine if a capsule contains an authentication section or depex section. (UEFI 2.8 errata a, mantis 2026) Signed-off-by: Oleksiy Yakovlev Reviewed-by: Wei6 Xu --- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 14 ++++++++++= ---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c index 53b821c..307060b 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c @@ -328,10 +328,11 @@ ValidateFmpCapsule ( DEBUG((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageHea= der->Version)); return EFI_INVALID_PARAMETER; } - if (ImageHeader->Version < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADE= R_INIT_VERSION) { + if (ImageHeader->Version =3D=3D 1) { FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMA= GE_HEADER, UpdateHardwareInstance); + } else { + FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMA= GE_HEADER, ImageCapsuleSupport); } - // No overflow if (FmpImageSize !=3D (UINT64)FmpImageHeaderSize + (UINT64)ImageHeader= ->UpdateImageSize + (UINT64)ImageHeader->UpdateVendorCodeSize) { DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) mismatch, UpdateImageSize(0= x%x) UpdateVendorCodeSize(0x%x)\n", FmpImageSize, ImageHeader->UpdateImageS= ize, ImageHeader->UpdateVendorCodeSize)); @@ -639,9 +640,14 @@ ProcessFmpCapsuleImage ( } else { // // If the EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER is version 1,= only match ImageTypeId. - // Header should exclude UpdateHardwareInstance field + // Header should exclude UpdateHardwareInstance field. + // If version is 2 Header should exclude ImageCapsuleSupport field. // - Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_C= APSULE_IMAGE_HEADER, UpdateHardwareInstance); + if (ImageHeader->Version =3D=3D 1) { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT= _CAPSULE_IMAGE_HEADER, UpdateHardwareInstance); + } else { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT= _CAPSULE_IMAGE_HEADER, ImageCapsuleSupport); + } } =20 Status =3D ProcessRecoveryImage (Image, ImageHeader->UpdateImageSize); --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59385): https://edk2.groups.io/g/devel/message/59385 Mute This Topic: https://groups.io/mt/74169598/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-