From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.7999.1589443378829708094 for ; Thu, 14 May 2020 01:02:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=RISVamie; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: liming.gao@intel.com) IronPort-SDR: CUo1mXKWqXVDTGN2XfpRDeEarqrs2K0k7BkajKr/b1rmjC5zMUUKYQTRjEHUMYBlIlb3ZOhAse disBfFvd1lEA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2020 01:02:58 -0700 IronPort-SDR: jfv8kgtD/drQXvtsDgCjiMkcZ14SBod3O/xYA/02cyCWBkAL2DkzrGdaGDwxpJWJNL5LBhqIrl DLTE4A0ZAdIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,390,1583222400"; d="scan'208";a="298632728" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by orsmga008.jf.intel.com with ESMTP; 14 May 2020 01:02:58 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX108.amr.corp.intel.com (10.22.240.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 14 May 2020 01:02:57 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 14 May 2020 01:02:57 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 14 May 2020 01:02:57 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 14 May 2020 01:02:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MHEabwb/YKaregx+L0nTRsfvWzE76rZ8xNzpbu4pWVtvTHiSBixov/zgrJqqimEnH8OLud3ovtgRTXD0zHM0F5mA+4+lR447yhU6XAaCcpGu3v0K0y+40DhdgsaCrKRLlBe6+5fpCKc+1+xPuTQ6lthOHcNUCbK7JWJXTbqtUc8yJHM5iOTqP2kvl8oMl3HDjcTeNalx2zVQm6Ao5yewNpr0K0FQFUFXSrYJEddO9AK7tO7pBjmhQJSxhzfleVTaeijtmofN11j7egJDLhlc4rk4sgNFwGzU/LHXiwG4Cp4SbP2ZMBEgOfnrXn+hxz6mZ3SRI+cd4268mQiKxrF3gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jEegiz3UfiyxhHQZTTyr1UzFQvkq35/lkebOLI9Rf7o=; b=oMSpC9Yy+yDTcURCxg9yF8PWoaddtHUdWwb2ArtCwi1nTHNLkX/+9B0sjXQ8Z3li0NYWr4Wzsgl0QpnHjYRt1hkLTgCcz4x4uX8H+3mP4P5b1D0qYcVUPnf5o58Aiu+cMekrigFIBR3UvWiXRNDIsvlcry2Zqz9rNHh75NaaVWjkmA5I19Q0eeDuAAX/62et4/n1vkvjbywK+gUbTcALTY71pFH1qC7MiVBr1d21pZBepSpJorf1Yykk9dHfa5HKlJYF6PNmcAUQZsHGd3ZeoLdv38idFqqJgjfXUb/ZA0j1764XJmuiVHxKV3y35ZVHgqhv6SsADJJeXOURA8CDnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jEegiz3UfiyxhHQZTTyr1UzFQvkq35/lkebOLI9Rf7o=; b=RISVamiembV2p+MqCLAbcWQQjO1wtlIcbfu4wvvqN+sftpvxwSHjxPUgjQ2dDZ7gqvj2SHDSJWqcTPQu/5pbzbip1Y/DTlkVu6XMACX3Xdk3aUDItKY9gh2LIGOMGEzroNGlqQ7cLKieVn9CYd3mBCLWI1c22Gx8EhbcaJJS/Gc= Received: from BN6PR11MB3972.namprd11.prod.outlook.com (2603:10b6:405:7f::11) by BN6PR11MB1330.namprd11.prod.outlook.com (2603:10b6:404:4a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.25; Thu, 14 May 2020 08:02:55 +0000 Received: from BN6PR11MB3972.namprd11.prod.outlook.com ([fe80::3c03:da06:5345:bfa0]) by BN6PR11MB3972.namprd11.prod.outlook.com ([fe80::3c03:da06:5345:bfa0%7]) with mapi id 15.20.3000.022; Thu, 14 May 2020 08:02:55 +0000 From: "Liming Gao" To: Oleksiy Yakovlev , "devel@edk2.groups.io" CC: "Kinney, Michael D" , "Wang, Jian J" , "Wu, Hao A" , "Yao, Jiewen" , "Zhang, Chao B" , "Felixp@ami.com" Subject: Re: [PATCH V6 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Thread-Topic: [PATCH V6 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Thread-Index: AQHWKXedIllIXkj0aUyBf9PoPQN1W6inOSyw Date: Thu, 14 May 2020 08:02:55 +0000 Message-ID: References: <20200513223947.56560-1-oleksiyy@ami.com> <20200513223947.56560-7-oleksiyy@ami.com> In-Reply-To: <20200513223947.56560-7-oleksiyy@ami.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: ami.com; dkim=none (message not signed) header.d=none;ami.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.195] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9a4c48c9-62d8-4ca9-338f-08d7f7dd3562 x-ms-traffictypediagnostic: BN6PR11MB1330: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1091; x-forefront-prvs: 040359335D x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vSYOKg4QJ/V5bhSbF8uWITS3k+jOaF0beCQ9SoYxDmGFLkKmWeDgigW6SvqGsoqvBt1BvyKQ6rvZ9EydZW3+ZExrf6LGQ3haZIsHTN/jw4pz5Wg+y14Ee2++agRg0XFnLPlUEfe0IXIiSSzh5jTwg7+XkuZiALtOM4LWtcbnztN7XOnku+Bjf8F0/LBum1tU07QH+gX2Vod9HLNHooPJ7NtRXeniaWPDp+cpo/6JmF95FJstMtfRKQvmreCxPLrbzz1NaTUjgKGjH4VaSNIw+mUimGNRUEEBX2NBdRhLnXFSlYQaTKrQfUeTVWgXou5JDvz+a97W/bJ0AHEHWk6Wwyc708oGP8pa+jSzJczb6IM81asYG4PZ52JAAztsqcZb775q0Z5GaFIhMD2K+EUjAIK0EsF9jtgrBN8MtkP0L+opxNdum2yNVoW32DKunHAh x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB3972.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(136003)(346002)(39860400002)(376002)(366004)(396003)(2906002)(8936002)(186003)(5660300002)(33656002)(26005)(478600001)(71200400001)(52536014)(4326008)(66946007)(64756008)(9686003)(316002)(55016002)(7696005)(66446008)(54906003)(110136005)(66556008)(6506007)(66476007)(8676002)(76116006)(86362001)(53546011);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 9XQ1TJs5eGvc0og0HWmMWr/UAwsAkHTeX8LGMwuNHAHkMg5jgNDTJTtr0PDJE3V7NRwFlQAdW33E27RN5V6k87YH5qCN6nBfTM7/GAna05A6fFkQV2mEcJsaGFI8j9oteYJwCBJHXAjfM/QTOz90nwS81hXp51sq1vQElCeC8np+1aVmE+++c2KQRQTJ0sF6CpJN5uQyUDAkoPm3Y0r/EJ2WynslEiuxGwQGUyJrL4BuIOXhJP99agJ9Hsyww27pso/7bz1G8Ltv+ESRYODg/ir46WS4GpoHO3wG16zv2SJVagiv5VlMcMytz8HLhcOnfYPpWRtu4CUMR8lU8ctGMOY14JJF6lJ+z4X2o0hh72U/Ftvosp/x0ySYePTI41bWD6B/FtU6wL4klxtqfyHwBIo6rraBI/VWg/hymLwZXmrpyvTLbo891M/AfVJ7YpY3s0YeXRjpuS03+QscGx4ptpe8l2DxqWJfaNXZu+Szy/Bsyj1tX5VxhqK41GR+GXxw MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 9a4c48c9-62d8-4ca9-338f-08d7f7dd3562 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 May 2020 08:02:55.0416 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: WrZBnSTUnTfPm3G9JkkbytJk/yYbMXuJImRbjz0iL2AquCQE2WamMvJeoRf/HDInisYXfXk5GNny1TRL81ytPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1330 Return-Path: liming.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Oleksiy Yakovlev > Sent: Thursday, May 14, 2020 6:40 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Kinney, Michael D ; Wang, Jian J ; Wu, > Hao A ; Yao, Jiewen ; Zhang, Ch= ao B ; Felixp@ami.com; > oleksiyy@ami.com > Subject: [PATCH V6 6/6] SignedCapsulePkg: Add FMP Capsule Image Header ex= tension >=20 > Add bitmask to structure which gives a binary-inspectable mechanism to > determine if a capsule contains an authentication section or depex sectio= n. > (UEFI 2.8 errata a, mantis 2026) >=20 > Signed-off-by: Oleksiy Yakovlev >=20 > Reviewed-by: Wei6 Xu > --- > .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 14 ++++++++= ++---- > 1 file changed, 10 insertions(+), 4 deletions(-) >=20 > diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryMod= uleLoadPei.c > b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.= c > index 53b821c..307060b 100644 > --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoad= Pei.c > +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoad= Pei.c > @@ -328,10 +328,11 @@ ValidateFmpCapsule ( > DEBUG((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageH= eader->Version)); > return EFI_INVALID_PARAMETER; > } > - if (ImageHeader->Version < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEA= DER_INIT_VERSION) { > + if (ImageHeader->Version =3D=3D 1) { > FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_I= MAGE_HEADER, UpdateHardwareInstance); > + } else { > + FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_I= MAGE_HEADER, ImageCapsuleSupport); > } > - > // No overflow > if (FmpImageSize !=3D (UINT64)FmpImageHeaderSize + (UINT64)ImageHead= er->UpdateImageSize + (UINT64)ImageHeader- > >UpdateVendorCodeSize) { > DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) mismatch, UpdateImageSize= (0x%x) UpdateVendorCodeSize(0x%x)\n", > FmpImageSize, ImageHeader->UpdateImageSize, ImageHeader->UpdateVendorCode= Size)); > @@ -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= _CAPSULE_IMAGE_HEADER, > UpdateHardwareInstance); > + if (ImageHeader->Version =3D=3D 1) { > + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEME= NT_CAPSULE_IMAGE_HEADER, > UpdateHardwareInstance); > + } else { > + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEME= NT_CAPSULE_IMAGE_HEADER, ImageCapsuleSupport); > + } > } >=20 > Status =3D ProcessRecoveryImage (Image, ImageHeader->UpdateImageSize= ); > -- > 2.9.0.windows.1 >=20 >=20 > Please consider the environment before printing this email. >=20 > The information contained in this message may be confidential and proprie= tary to American Megatrends (AMI). This communication > is intended to be read only by the individual or entity to whom it is add= ressed or by their designee. If the reader of this message is > not the intended recipient, you are on notice that any distribution of th= is message, in any form, is strictly prohibited. Please > promptly notify the sender by reply e-mail or by telephone at 770-246-860= 0, and then delete or destroy all copies of the transmission.