From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.7719.1589251131031888372 for ; Mon, 11 May 2020 19:38:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=HReypvkX; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: wei6.xu@intel.com) IronPort-SDR: /oNZwZQADpXJuzdGE8SoZX4AvmCGd0tdPPrKBqRC422NBPE4j0st8Qk8Bb6kOMLYyZcIl/JqmU 1LZIfVUyI3YA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2020 19:38:50 -0700 IronPort-SDR: IusMtkME3l8/LDKpVXM1k6rjXheJ57HLU4SauerqyZW3g9Lnh1ucWsBS01NrbVJgO6rsGoRPE2 G+e5dA97EbQw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,381,1583222400"; d="scan'208";a="409136145" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga004.jf.intel.com with ESMTP; 11 May 2020 19:38:49 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 May 2020 19:38:49 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 May 2020 19:38:49 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.36.53) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 May 2020 19:38:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YnzBqOAC9CMje7+wha3b6PH1KmlpONjlz2pHms6kxN8/JPXX8SBqPXXyIFwHe/sUBfnYWRMXE5b5bKkiAAA9AafMYyh7QrphXu2ebWCvm/KtZHyU/NxR+96spSN9RGGOMZVROl7hw0dTmdODqOA9C1iqfzKaFY50G1UNLPw+LuzNQnDMbERfwD3U7bmt9IuxKZ1UiXifqXzD1F3t/73CI3EtZI1iCZMTnoJiV8oJ07d2KBKGEBI47tWZnVcse0Lz53L2Rg3ANXZlFZnAhsFvf+UOasfXHbgZR+FK185hBqTCjA7tMZ2FdSTjsaGYdq1PbQ4UFmk9Hxaam8neHK3/3g== 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=sAc90KuutuBZZKhpTI80VRV3BBqnEk6Mr8SBz7l9JQQ=; b=h1fOj7WBOzSwk6Co3eiA+KN7RlZdbAsF2Cb7sozIij1zw8m1TqVqWBJJLOkox0cGs6SVLYg6xPO8sQYvTVtrIoGcpFekqPjKSOAkZD1N19yuzz1Sd0t2am+Mt5dEqkx7QThmpZftcg8W5hll7iLvAqBrv+FxciMniW3j8KWX4Jg5Q5pJJsa1nu6xG2YytHUGqDkK6XCdQIl80zISz8M7Ggob+vEA+RfqGc44YRKgH66NbtwjFEOb0xEUfJTR120XT9CPgiv3XWP29u1ImWrVOiQIUM30J92Th1cusf2K14GsAmlLTZlUyARAGXk1i75299AvnuMvrxFuqo/XDCFUNQ== 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=sAc90KuutuBZZKhpTI80VRV3BBqnEk6Mr8SBz7l9JQQ=; b=HReypvkXDR0LL4LWiflzGXvbHpTRY4+1ymbSboxDlh85WFlyvPONWTtVXXkygtl5KpJTO1X2BSzPScLB1/6AQsjkE7Iv19g+lJZr7FvSELXrhkpvk34nlxjd7DKcEXO85ooE2AdbF/t51Gbp83+vhcf2yuLMducDpb6h5xlwzOo= Received: from BN7PR11MB2770.namprd11.prod.outlook.com (2603:10b6:406:b4::20) by BN7PR11MB2865.namprd11.prod.outlook.com (2603:10b6:406:ac::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.29; Tue, 12 May 2020 02:38:45 +0000 Received: from BN7PR11MB2770.namprd11.prod.outlook.com ([fe80::2929:ecd:8139:6a56]) by BN7PR11MB2770.namprd11.prod.outlook.com ([fe80::2929:ecd:8139:6a56%4]) with mapi id 15.20.2979.033; Tue, 12 May 2020 02:38:45 +0000 From: "Xu, Wei6" To: "devel@edk2.groups.io" , "oleksiyy@ami.com" CC: "Gao, Liming" , "Kinney, Michael D" , "Wang, Jian J" , "Wu, Hao A" , "Felixp@ami.com" Subject: Re: [edk2-devel] [PATCH V3 5/5] MdeModulePkg: Add FMP Capsule Image Header extension Thread-Topic: [edk2-devel] [PATCH V3 5/5] MdeModulePkg: Add FMP Capsule Image Header extension Thread-Index: AQHWJ95pW1jj2x2makWpXJFQqB1lEKijutRQ Date: Tue, 12 May 2020 02:38:44 +0000 Message-ID: References: <20200511215040.31780-1-oleksiyy@ami.com> <20200511215040.31780-6-oleksiyy@ami.com> In-Reply-To: <20200511215040.31780-6-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.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: db5eb420-5720-43c0-7330-08d7f61d977d x-ms-traffictypediagnostic: BN7PR11MB2865: 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:2582; x-forefront-prvs: 0401647B7F x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mMC0Tf9kU2bfmMifItBXW7OTVi/g5cdQJX3+XNe+xvF/qxXRWyYkvM7DPBPX1Eam8y6BALqnMNEmFlzaCL7UtuKyr2isSSay6cs6hK1f2JAhLcfXj+ugb83VjVrGTGu+rHHxyMXMk60U5dARBHpMJAd5yUxPSr4U/qnAkM4JdXRcoYhOFsiqaG23bZ+ejjvY871YMJxwS8AENC9g4/MVIDHqpPeBUOvRmnjCKgPtFovJ4XNVCurzTL7D5LJdrJsSg6K/uYvRFlUPYUjq4rGaMMYOCIrPXPA4RdrrEaHETSl07ViRJpApl+zLN8KBueyLgfhtaFoQFWaIJnOnkwXB2oLVLRzeeDCM/Oi3d0rCcRrqVpXBCwoyQpluZR6EZ7SIo0gNlykyMi8pubrW4H4E++5i39QMYYRUSeifeB+kqWW7/kW8D8munH8BE//qVMDpYHMsO+LrsiXK3i0qns7KvIiQqsffuWfPl4AaMoi+6puK9FzWmjr08I8/+RrPxQDwCS+o+R/2JeOikC2m8GM+LyaOj2gOy1SZydhUtBfr1W0YxajihUDsl3W62Tn9F0UqSFoDvqLH70itX1Wxdf4ZU325eHQ73bPuiaD6YolIYfw= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN7PR11MB2770.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(39860400002)(136003)(366004)(376002)(396003)(346002)(33430700001)(66446008)(7696005)(478600001)(66476007)(64756008)(66556008)(8936002)(5660300002)(6506007)(53546011)(55016002)(4326008)(52536014)(33656002)(2906002)(26005)(186003)(33440700001)(8676002)(9686003)(110136005)(86362001)(71200400001)(76116006)(54906003)(316002)(66946007)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: krsVsPEC0qaE7aNeFiYFixxBtq6ipJ9zmULqlnKA8GjBgi5xU2kMdRxv1Obj959kuPeQXGF+FatEkzoCM2P5d3INaEIfb2k8sMwpyIrrG6t+qKUt9JyIduPps62HfH76TGzzLFSe4Yp/WaAnVPR0747vy/S29WKhUJq60jjzoA+6m/oTr0FSEvfvRdF5YxXsP+oqI+HdGHrSudM2SY0VV5849SAPgthBEraGv5UGk7s3E7MruGc7zpvJY3VZijnwINMkiAYXbWY1t23uYQl1SrTL8ffepZsC5sA7F4SLAUBlleAsYzXBwlkQVxYY5CQT6otmAEN4C4h/KSXXFF9qvHy/3RseiVueap5qLndwiShVPx3OxahQfdgxot7AdCKLlM8ldhx1/DcyQvyN48wlTv4n4CdbCuHHdp/RWBMDBsAArckW8VUfO6EFdHgJ52rCF0zKSyg/t/86yqMDEv1B9HIJgyrphC1ioUYizv38FvZqM7Pm/LffNFA0haLStuVI MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: db5eb420-5720-43c0-7330-08d7f61d977d X-MS-Exchange-CrossTenant-originalarrivaltime: 12 May 2020 02:38:44.9361 (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: x0EkFrEjEcUp6ULYjsCqhc5H7MjW2T8j+hQUqexjRb4NgcQQ2x395hYr/77HEOkvixBAHAyFxX0xtHWcRDes4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR11MB2865 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 Hi Oleksiy, Thanks a lot for the update. But besides it, there are several other place= s need to be updated as well: https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Application/Cap= suleApp/CapsuleDump.c#L99 https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Library/DxeCaps= uleLibFmp/DxeCapsuleLib.c#L522 https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Library/DxeCaps= uleLibFmp/DxeCapsuleLib.c#L926 https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Library/DxeCaps= uleLibFmp/DxeCapsuleLib.c#L946 https://github.com/tianocore/edk2/blob/master/MdeModulePkg/Library/DxeCaps= uleLibFmp/DxeCapsuleLib.c#L1242 https://github.com/tianocore/edk2/blob/master/SignedCapsulePkg/Universal/R= ecoveryModuleLoadPei/RecoveryModuleLoadPei.c#L331 https://github.com/tianocore/edk2/blob/master/SignedCapsulePkg/Universal/R= ecoveryModuleLoadPei/RecoveryModuleLoadPei.c#L637 BR, Wei -----Original Message----- From: devel@edk2.groups.io On Behalf Of Oleksiy Yak= ovlev Sent: Tuesday, May 12, 2020 5:51 AM To: devel@edk2.groups.io Cc: Gao, Liming ; Kinney, Michael D ; Wang, Jian J ; Wu, Hao A ; Felixp@ami.com; oleksiyy@ami.com Subject: [edk2-devel] [PATCH V3 5/5] MdeModulePkg: Add FMP Capsule Image H= eader 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 --- MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeMo= dulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c index 5dda561..af80039 100644 --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c @@ -285,8 +285,10 @@ 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); } if (FmpImageSize < FmpImageHeaderSize) { DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) < FmpImageHeaderSize(0x%x)= \n", FmpImageSize, FmpImageHeaderSize)); -- 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.