From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.105.1589404487407241208 for ; Wed, 13 May 2020 14:14:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=kJt9gcp5; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: wei6.xu@intel.com) IronPort-SDR: YJOWYtZxfVqELFJjy1wMnisCneZ1fOEzNvBtOD09gjYVg+IM43G0QetBvAKEzebAWG6V+3ZJIR rTTiFzNHPE0A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2020 14:14:41 -0700 IronPort-SDR: AjwIhr+BYDTjowBk1lKqna9cDKJl5VVpTwP8lsQ+yjbNzL3EqNida9MytCBpHIXsJG/xbhuFvA lrEliyvLCh7Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,389,1583222400"; d="scan'208";a="372028176" Received: from orsmsx108.amr.corp.intel.com ([10.22.240.6]) by fmsmga001.fm.intel.com with ESMTP; 13 May 2020 14:14:41 -0700 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX108.amr.corp.intel.com (10.22.240.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 13 May 2020 14:14:41 -0700 Received: from orsmsx604.amr.corp.intel.com (10.22.229.17) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 13 May 2020 14:14:40 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 13 May 2020 14:14:40 -0700 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 13 May 2020 14:14:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fw5e3BFdLMXfU9P3otv5PFiG+okN9UyjSZOrPKNozXjKL/W+Zcbez30W9U2vHtiKbUb+FE0gIsOH03ABmAdhZRZXG/cRDWIIhK80FQcXIb5a4VniLECGELyh+V3qUJprQGd4u149BZad0+oUjKdpGNFl9yKV9rfQKfh6HNU8S7fqG90o0oe/NRJ6KdF0hgJougypa0OhrjtPV+I0exGbeWTPgSenrH5o5Lh6mj7ZrZe5P1O0XIJko0VH0CWqfdzlHX2chCdC3qA1fpmEO9Z8rrWW1EavS8Er/vVh9OwKW0UZMxuZPJIKYEu7+0Qs87Gz1/wnhu60r5Tbpi7nbnhpNA== 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=KcOFPK4bCIzAJCpHgWoOElStA7BR6zJLVbQAxYHbzag=; b=E1csdW0HReO4gLbsQamOWugk6VfVVxrl1IPpUSy1J8oM3muy9b0j9ZbmefPgEFqk/PUQB4r/wOBJ2HGX67ykYuD6uSy+PkgvlV5+f/vO5DWf2UnQejF9DI+bEDcIODM8qtRJneKNy/mAUQDwBxDMJtwDxmvW1Cd6OEBrK8pXyvFV6tUS2XSToHK5mDRfT4Qcc85/KlGr+q0fYhiCQ3syOtW4kRROgadXuj8O1O3mi5NZVRRUKcXw6UTzuZKd0ah4tj7vjZgwbgoXJ+hW66DS/R/ZBOt7MLMM7KyzQ2AnhiyYgqazyfx+qsSiRdTTOpzocdMSN/jYo+Q8RmIoaph0bg== 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=KcOFPK4bCIzAJCpHgWoOElStA7BR6zJLVbQAxYHbzag=; b=kJt9gcp5sRuFQYJNk+XkzSG4By4K8Pxm0PuV2JIsKUsQTdkaVrartMLNTKLv5/3tS34aPAAIenC7p0qhA/65DQgjU7a9492SWyCDRycaOw3yKMRPEYBdbbvQl+ozu6cy2qTDWUdmpld2P2kkfU+iwky/15lHEPB+/gGpo5Mg4h4= Received: from DM6PR11MB2777.namprd11.prod.outlook.com (20.176.95.159) by DM6PR11MB4217.namprd11.prod.outlook.com (52.132.250.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.34; Wed, 13 May 2020 21:14:39 +0000 Received: from DM6PR11MB2777.namprd11.prod.outlook.com ([fe80::8129:bd89:65b7:d807]) by DM6PR11MB2777.namprd11.prod.outlook.com ([fe80::8129:bd89:65b7:d807%3]) with mapi id 15.20.2979.033; Wed, 13 May 2020 21:14:39 +0000 From: "Xu, Wei6" To: "devel@edk2.groups.io" , "oleksiyy@ami.com" CC: "Gao, Liming" , "Kinney, Michael D" , "Wang, Jian J" , "Wu, Hao A" , "Yao, Jiewen" , "Zhang, Chao B" , "Felixp@ami.com" Subject: Re: [edk2-devel] [PATCH V4 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Thread-Topic: [edk2-devel] [PATCH V4 6/6] SignedCapsulePkg: Add FMP Capsule Image Header extension Thread-Index: AQHWKKmzCYhq+emc00S6WztIRkPeo6imhSqg Date: Wed, 13 May 2020 21:14:37 +0000 Message-ID: References: <20200512220543.40008-1-oleksiyy@ami.com> <20200512220543.40008-7-oleksiyy@ami.com> In-Reply-To: <20200512220543.40008-7-oleksiyy@ami.com> Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.38] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 44d93a9d-94fa-4271-ed47-08d7f782a577 x-ms-traffictypediagnostic: DM6PR11MB4217: 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:1468; x-forefront-prvs: 0402872DA1 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +ilZ+/lpq7h4TjeUoPeYXN7e+kmW5H4Um7vFaeqleA8KU1ODaPkWmp0Gp0sQ8+Gtr1jA2Uf472vh/A2atdKgYoTVa5mros5sfGACLjE2yEP+Wr7QOyY7E/bXPWTyzYjsI+i8pOgiEzz3q1ZhUKenbpYidEo1JYq4rB2woDkv0IDxwp+CcUHhA80tWln95apEzaEqJAEhW/wYi45Z+hRKPEErFEUi7aL0MMmoHvJvbMvaPwMddYd6/b0azHQ1CI31blv70U1YtAXtCvMmWeyiylYuzxzowdSHA+M1WwAgMuFmcXlt/3oN+/uW9JIdn/YT1+5TJiuXNcOqRFC5W18FdMEMBAQlMnOgse7r4BffN31uosNk035s6xZJER3to1O0aRrfvZ/MkNfkiPZwOFjLoM1lpiB3JYhR/xCM/meWnjfuOu19uExskWUTw+bCa6rTZ0Fmsa7WKbeF8ASsVNfS67QtX/HvY0sIaQHQxgPVsd6VHSRgcty9ywGeDqkpN2ZNMzlGmhqnnmDqLWXbGZhwlHlIbUcWF3yCx880Ge5bKBtpAztnFQsSP8/DLMnFJ2Iqvv4p0Yy/HJ7ehWZOnZlqOmZTFciq/lFWFX3Fr4h2sTs= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB2777.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(376002)(366004)(39860400002)(136003)(346002)(33430700001)(76116006)(71200400001)(55016002)(86362001)(5660300002)(33440700001)(7696005)(9686003)(8936002)(8676002)(2906002)(4326008)(64756008)(52536014)(966005)(316002)(66476007)(66446008)(186003)(54906003)(33656002)(26005)(66556008)(66946007)(6506007)(478600001)(53546011)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: erKImf1M3Q6K3cGSaJHZh6gTavTi2nBbecUdsnfrzE3eFF5UTCJUhGBszWrCJ+awxbAFuDiQartyNJ+jpVaDGktUZsl2X5NUhXav1I+YGKOw5tvgZBXq2BmzIjB819PNPi2IYOnNxYdGQLkUfjP7VXVCOvXIsIQVBMSJD0xWtkR1v6Saxk/7B8crO6L8GyoqjI1zAFHNoik5vCb58hT4qvBhfUS0z+dl2uf42cN9xAZob3AiYQkHVaPzlchwbWLPtSU2uYUsYYdgCqtk3rRC1A/NK7T1gqnlyoLjDtIMHJn3DoEEOvJPlscgYz8dsUWkeLI1uixyq829MbxPz9R/oJozPZmc+Cjdxb1UVKuoLLHjlB8rla5MVZ2fT0ixW3KEe3rEJRBOt1rV2RMzZPg8q2a5YH7OCBblDvAj6tdjUBFWO4r6z1h0gRH4IwbTaUUckRmkRN4vgWkTikXeqx3knbJgVTATcvzuXZF9w7dLLPW9pDtcmVAG3UZNtAlw5926 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 44d93a9d-94fa-4271-ed47-08d7f782a577 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 May 2020 21:14:38.7405 (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: 1sJCHVJa49fhmUowIA7UJss/L7tPUVNtAUaD+pd9+C69/FdGXeDXxJ8oxj9AEC4dXsXdVu42ht5R7xDyZ5331g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4217 Return-Path: wei6.xu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks for helping update the related version check. Reviewed-by: Wei6 Xu -----Original Message----- From: devel@edk2.groups.io On Behalf Of Oleksiy Yak= ovlev Sent: Wednesday, May 13, 2020 6:06 AM To: devel@edk2.groups.io Cc: Gao, Liming ; Kinney, Michael D ; Wang, Jian J ; Wu, Hao A ; Yao, Jiewen ; Zhang, Chao B ; Felixp@ami.com; oleksiyy@ami.com Subject: [edk2-devel] [PATCH V4 6/6] SignedCapsulePkg: Add FMP Capsule Ima= ge Header extension Add bitmask to structure which gives a binary-inspectable mechanism to det= ermine if a capsule contains an authentication section or depex section. (UEFI 2.8 errata a, mantis 2026) Signed-off-by: Oleksiy Yakovlev --- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 14 +++++++++= +---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModu= leLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModu= leLoadPei.c index 53b821c..307060b 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadP= ei.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoa +++ dPei.c @@ -328,10 +328,11 @@ ValidateFmpCapsule ( DEBUG((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageHe= ader->Version)); return EFI_INVALID_PARAMETER; } - if (ImageHeader->Version < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEAD= ER_INIT_VERSION) { + if (ImageHeader->Version =3D=3D 1) { FmpImageHeaderSize =3D OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IM= AGE_HEADER, UpdateHardwareInstance); + } else { + FmpImageHeaderSize =3D=20 + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER,=20 + ImageCapsuleSupport); } - // No overflow if (FmpImageSize !=3D (UINT64)FmpImageHeaderSize + (UINT64)ImageHeade= r->UpdateImageSize + (UINT64)ImageHeader->UpdateVendorCodeSize) { DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) mismatch, UpdateImageSize(= 0x%x) UpdateVendorCodeSize(0x%x)\n", FmpImageSize, ImageHeader->UpdateImage= Size, 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_= CAPSULE_IMAGE_HEADER, UpdateHardwareInstance); + if (ImageHeader->Version =3D=3D 1) { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMEN= T_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance); + } else { + Image =3D (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMEN= T_CAPSULE_IMAGE_HEADER, ImageCapsuleSupport); + } } =20 Status =3D ProcessRecoveryImage (Image, ImageHeader->UpdateImageSize)= ; -- 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and propriet= ary to American Megatrends (AMI). This communication is intended to be rea= d only by the individual or entity to whom it is addressed or by their desi= gnee. If the reader of this message is not the intended recipient, you are = on notice that any distribution of this message, in any form, is strictly p= rohibited. Please promptly notify the sender by reply e-mail or by telepho= ne at 770-246-8600, and then delete or destroy all copies of the transmissi= on.