From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.3908.1588992088024272395 for ; Fri, 08 May 2020 19:41:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=aEKY7pO/; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: liming.gao@intel.com) IronPort-SDR: r1VVHO5T3lK38Vrc0kqRu984AwQakW0V2mucKdGy4F19W1ajDMEmCVz4NzCwACQqkIptcdYkUM 0ocdl6nswc9A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 19:41:27 -0700 IronPort-SDR: 38LumhqC8foXKsNzf0KT3/mmaOQukcYyABZanUyWclxW4H6QsFFmclHZycwXBLhNsB6RKhD8oZ YZYUt2lbqrTA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,370,1583222400"; d="scan'208";a="408304801" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga004.jf.intel.com with ESMTP; 08 May 2020 19:41:27 -0700 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 8 May 2020 19:41:27 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 8 May 2020 19:41:26 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.177) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 8 May 2020 19:41:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DeembIEnbp/BgTG6XskdEv5P7k/ofCJtM5cb5tw92A8VwS1EjpNhhO35naJl4ZXNsl0a8BXho1hWYWtglj+vjzVa1kaJsVppcE/7BSwukStg4kqAXsj1ImTubJQE5UwcBniFNY8e3j9gykQjjjpyNbHxYMHQy1oB/ZdY8FsQ2YkjWTQ8zgY0jMTYaaZN/8qx5MFUNusCrFYu6Sp6KdPYe+67ihkZ4SDsm+iO1UimfL3CRCCVMB86uchvU8j7O3f5vWUE3Wuw9hDlF5otaVFbawG4wp2So4JrMtXvkQFlIxjMpOSyJMHCEAG8pO2pQX4z0IQg2Ve3wKAPlkyG5y+NWw== 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=i2oM0BiISXt2kJSUACo0usjQkNl24jxDMCQz0wE02TI=; b=J4/SYu5+rwicthWENHeu0pjhZH9195bTM693DLfT+IqAnqyz6mragX06ryQ28/OE676RnS0efJDdwvJZETWx6TPhLgOCAbSMeTZXBaUcrnwsSBfIuLtGZr4QjVgjULTslAxPZ/hWDbdEoRpSgwOj9I9Ij99KQPCSCQ6kLRA1BpwQQZsWroyZl2btxKfYI+FlwgZ+CNAZ/T3TI5lBU7+gnLbSq5EsQGUCQf+TKBc9DLzzJNBF4OedjtI/J/my+ijeaQVR3C5cqvE2IrSw7UTnwwTNPtAJiAVC4XiPr875pVOt6I0yQlR7R0lhASRZUEGNb9cKf6Cm7byN4OoBq9Sn2g== 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=i2oM0BiISXt2kJSUACo0usjQkNl24jxDMCQz0wE02TI=; b=aEKY7pO/Enfdf1UIOexR/UoWRrWsbtLLPLzqWGRytvSzdhBBk/bkqZFub75f/J+mE7WANzdAsrqpl+h95xVom5A42ypCxuabyPTjiFRaq7QvO4p0/nqX+LUIPpcFRBqmb5wZoOdlm62mWd+KU4rLq8L7jsXvc1d5Ef1QYXbCeXw= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BY5PR11MB4242.namprd11.prod.outlook.com (2603:10b6:a03:1c1::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27; Sat, 9 May 2020 02:41:25 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::296a:eb1c:2b52:2904]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::296a:eb1c:2b52:2904%7]) with mapi id 15.20.2958.030; Sat, 9 May 2020 02:41:25 +0000 From: "Liming Gao" To: "Feng, YunhuaX" , "devel@edk2.groups.io" CC: "Feng, Bob C" Subject: Re: [edk2-staging][PATCH] BaseTools/Fmmt: Fix found the next FFS issue Thread-Topic: [edk2-staging][PATCH] BaseTools/Fmmt: Fix found the next FFS issue Thread-Index: AdYlpUzbYGIqiayXSXG6NdcZlBf1zAABgLBQ Date: Sat, 9 May 2020 02:41:25 +0000 Message-ID: References: In-Reply-To: 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: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.206] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 29f99c26-f218-4f0e-5543-08d7f3c277aa x-ms-traffictypediagnostic: BY5PR11MB4242: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:381; x-forefront-prvs: 03982FDC1D x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9kNnk2PU2kvPNYxiAlbvzAbLYVnrjxEpTanXvP3QE7RWAWUVXwyimQJpycdE2KL0vUKeop2/u5fhMYhTDabEUnGd8lzG28K1yJIj51FkiQkbKwSjeBo+Cu6kY2TPJYSkVB4cScEBhPx00d95+1H8eM39sisfND0aedaxPAk1tpOdla6+QPwKdlLshp0BMy31AlFOR03uT+0L10PIlsCOsm+n4LYLj9x/Mgz1F6mPnXuqGqBYFsxwBABp0Du1n8xXl10UgTquEfOhSyrJJJHktuy1PStHzHEKamGC+L6WbQToCmKx+HhlOD1ZAcZCZEzvRRmptu3Kh7u2O+Zhu7Zo9KerZzg0PyF/ULHXYoDA8hpBdAiDbI7cGORZaiY7qwjM1adbT2XAIHIm7tGgrrOFxk9iTNkn9bdnov28Ig/fHhkX4wPdi+V0jLiEFTJyEZ1MkrnOLmgcEVBK7awfzQbpIis4xRQzdNo0Dh7oe3+jm1sMzHihDdEUtCg7ik/FfuemVTCyEcUAF6EDQbcIqzUQbw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3973.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(39860400002)(366004)(136003)(346002)(376002)(33430700001)(86362001)(107886003)(33656002)(5660300002)(52536014)(66446008)(7696005)(478600001)(9686003)(64756008)(76116006)(186003)(26005)(66946007)(2906002)(6506007)(53546011)(33440700001)(55016002)(66476007)(66556008)(71200400001)(8936002)(316002)(4326008)(8676002)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: OBAPFFx6QI2pvezLRgOVn/lwFbs6fgwq0Mx/MA9tbvK68uL4jQg4t1LQChlVZFaiQoMRbq+Ly77c1K/j/OJyc/jjh1DIV/rOPeGca1d+q0hpJBhrPeGMA+AgOSkHpW1lPT80ekGnyXXme2CTBUZGpCJhRI/nK/GlJYlCFT+Kq/s+ihkWYBrq3lowWiYtOHYgrMCXPwoYIgH9M9qL3qkbAl4GgePIGxMQWFq1rD9ImTYUpRURZG/rpR9+Ow1uK5vDXhEkKy6hEsiTTOqeBC+runOEhli/NLitbi5TZFPlW1cFWr0wDmHbPcS8pU1zCzT71c5seSWrA6ofexP31ZEl4ONZ+Ej+51ytJu88lHJhM370RP04U5RCBmaK6+2Y6xroFlmdWYsfcB3vm1beN1soz2P5FrrTviqQgXeUs6RjEGbEkveZlSjRbOl3Z/4PLMx6QgRmGPHB3Ce3lEWSh3yxHKjp6FVFyqfbSbndDdhFYpPLW0QCI6qN1rsF8qgjK4Ep MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 29f99c26-f218-4f0e-5543-08d7f3c277aa X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2020 02:41:25.1751 (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: +QnBkmVJAfq9JVK8MsbzSErdvjcIvJ1CAlVC2JjBxG1Fd6DUkRgkxAlgMNUvEQTaqLkt6cyH2g44323rTIKKug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4242 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: Feng, YunhuaX > Sent: Saturday, May 9, 2020 9:59 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming > Subject: [edk2-staging][PATCH] BaseTools/Fmmt: Fix found the next FFS iss= ue >=20 > if found the next FFS size equal 0xFFFFFF, return NOT_FOUND >=20 > Cc: Bob Feng > Cc: Liming Gao >=20 > Signed-off-by: Yunhua Feng > --- > BaseTools/Source/C/FMMT/FmmtLib.c | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c b/BaseTools/Source/C/FMMT/= FmmtLib.c > index cdbee3d629..4fb10ecfe6 100644 > --- a/BaseTools/Source/C/FMMT/FmmtLib.c > +++ b/BaseTools/Source/C/FMMT/FmmtLib.c > @@ -1769,10 +1769,13 @@ FvBufFindNextFile ( > (*Key + sizeof (*fhdr)) < fvSize; > *Key =3D (UINTN)ALIGN_POINTER (*Key, 8) > ) { > fhdr =3D (EFI_FFS_FILE_HEADER*) ((UINT8*)hdr + *Key); > fsize =3D GetFfsFileLength (fhdr); > + if (fsize =3D=3D 0xffffff) { > + break; > + } > if (!EFI_TEST_FFS_ATTRIBUTES_BIT( > FvbAttributes, > fhdr->State, > EFI_FILE_HEADER_VALID > ) || > -- > 2.12.2.windows.2