From nobody Sat Apr 20 08:48:12 2024 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+61396+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+61396+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=intel.com Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592384495915747.5819315902808; Wed, 17 Jun 2020 02:01:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JYPEYY1788612xfNxUSh5jtK; Wed, 17 Jun 2020 02:01:33 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.3437.1592384493101720051 for ; Wed, 17 Jun 2020 02:01:33 -0700 IronPort-SDR: IYHPTpRNyN1OLtH0Lf0wWQdsAVdASfsxEeSfSat2Chb3PeoN16xNezKbVHvcbaTEznpNje366+ vQiK/dxp8Tqg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 02:01:32 -0700 IronPort-SDR: 4ovPQkIjgeJ83wlmY6V6sMVgCm3dNt9HJcX9AyS0UAbEL06FLmbMwsUzZqzJv5EXFZnLtViQBU 1evFQgOTTxQg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,522,1583222400"; d="scan'208";a="299224445" X-Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga004.fm.intel.com with ESMTP; 17 Jun 2020 02:01:32 -0700 X-Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 17 Jun 2020 02:01:32 -0700 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 17 Jun 2020 02:01:31 -0700 X-Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx610.amr.corp.intel.com (10.18.126.90) 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, 17 Jun 2020 02:01:31 -0700 X-Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.57) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 17 Jun 2020 02:01:31 -0700 X-Received: from DM6PR11MB3802.namprd11.prod.outlook.com (2603:10b6:5:143::30) by DM5PR11MB1931.namprd11.prod.outlook.com (2603:10b6:3:10c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Wed, 17 Jun 2020 09:01:29 +0000 X-Received: from DM6PR11MB3802.namprd11.prod.outlook.com ([fe80::244e:bbbc:1bf3:7fd6]) by DM6PR11MB3802.namprd11.prod.outlook.com ([fe80::244e:bbbc:1bf3:7fd6%7]) with mapi id 15.20.3109.021; Wed, 17 Jun 2020 09:01:29 +0000 From: "Feng, YunhuaX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH] [edk2-staging]BaseTools/Fmmt: fix Some RAW encounter dead loop issue Thread-Topic: [PATCH] [edk2-staging]BaseTools/Fmmt: fix Some RAW encounter dead loop issue Thread-Index: AdZEfqiH522eUuW6SxeLdUv4uNTymg== Date: Wed, 17 Jun 2020 09:01:29 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.55.46.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 570b6716-940d-4ad3-bff4-08d8129d0624 x-ms-traffictypediagnostic: DM5PR11MB1931: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2958; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: GkCC12WnzbBPnhQQuYCvF/3nIAJoTibJtNIkgzwM7NC5Jn2A5o7sUkPQLpDMbhaJJLO6WSJ82vhJSCom/gXh1UhHRPvuU2gjb6wOgh5prNzOs8B/9anm3ops8HQgsKWTAPcdWvleSUP7IJKdz8uySvHitJQtxeMWhfuznQpeah4RWV2MSP1qPczkFG0Amvn1njyc/G3wVDVasvrfEtnKLG1Kwt+PQQjLab+z5WNnm/9iiUAE9/V31POH5jUbFfxLLD3W9IAQbQyPQ31mb+l1Fc3juTpggEq5RqdazfZeSyqsboQQSqZa8wf93pEUvrzTIkXGhftAfLUZhvUwBpYuoQ== x-ms-exchange-antispam-messagedata: ff2Y9QMp86AqFa+/LUsI5ppghih2nSGjwkoJugt/q198wW2MqNbhh/MPCtKj1pzpID7Rwln0QEMjqTb5B0cw2L4UHXSEkD8klnD1Curb6ZppeCHl7YbGp1eEmvWjIV7Tbm1sroM/Yx+khqCkYnJxv20IzjslRj1/SUl7hY3Q3xz07dbdyU4YyLm1Y9a+euXTgmcPp55Vw2yRaNI61msDlWJgOHLLXTckKHlj9+KZdCyJcipQSm2Hoze1w5qOLW62szWgOUxyqEBAOFOU50OayICpYfWS6YyCjA8aZPMYd5c6idV4UdhUDfm4W5TYSNkWgtaSU02hAaFQmbgO1rCXPFKfEuvVsguek4c2pqXmn59WABOzI+znGY2Is/rvVI2XFakDeLZH5kWhueWKRrWM5j86JiqxTNSgTr0HuajMbHiedC9P88ImAXWE1asUMONMUJzSyo71rGKYraabFqsLpUW/Sp0BYm6iVwMUQcnb1TQ= arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hgUEWZvG+ABJnOebynvnACGZqu3xXuHnWkTA/WOT0RDmgM6PTPXVGWrzLyqkszy1KIwLPy6v+WecH356CvXrtrix+lbpQLAzp8KmtbFksVhzo7Afs/kwE9SWfuwlrHcSycOamzQE7j761cxevOyULze7MczNPzO9bfc6GTGqPkHwz2HacNZtDwEux8FuZyK9qiNI24+NPu+gp4f6ktv3MnZJRBC6rf30A5JQj3tn2tGYwEMJuN9nVieULZ6jUNcPh/q9Ycl0E6cw1q6WLD0hPWp9n2N//db8WPV0m3SGc14zsG4UIEdO+SwwXrc3GO62E5tHW0aXTFNmtF684YYtDw== 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=xlCxVvYU+MvU9qshNQgn4JLFkbQPDX2Pz6RKP4zADeE=; b=ix+orinJUswcKFBOq4IF5h7Abq2qSHz0kAKXs6oRo1yzANpgB6LR8Zjq2BGsK1Ty1/IJWgnpR+u3XMbec2NOlPtParguOsiZEvMc2vRBwmmETcmk3513GXO9aMzYk9/qa5DRddn11cl8av3+Ygi7CEwA3r7gHYMF7y0tHScq0Zq8Wa7REe6uzTzVz5rqdnyX6g8yXSnn08i0OoOCR/0upQDDkvRxj1WZa4abEz8TNu9fqwo3/7bnpEhF7ZzbHnDST9uDShxmqi9rA8EO6vbuAjuDWsXmRUXjhfrEk7kAgeyGhYUm1RJVm+SoNd2gc2kjomS/XWim9QT6eJHCJqGbjA== 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 x-ms-exchange-crosstenant-network-message-id: 570b6716-940d-4ad3-bff4-08d8129d0624 x-ms-exchange-crosstenant-originalarrivaltime: 17 Jun 2020 09:01:29.3033 (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: Gy7qzCZyrz2X2XAt7ICXcRPfg4bXV22d3CTAzsRHU32xjSVgYfqxuBvmg0nRLn8IGAdqrBwEB8adwNewG81h4A== x-ms-exchange-transport-crosstenantheadersstamped: DM5PR11MB1931 MIME-Version: 1.0 X-OriginatorOrg: intel.com 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,yunhuax.feng@intel.com X-Gm-Message-State: o9W2c0cHmYdXOcmIJTEjKRL1x1787277AA= Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1592384493; bh=ueAatkKH6KnuChPL0rl0gNMf6gocd6FMv7E125YBBQU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=xT3NDn2EXSJIYkHi0XD3/sdsZvir1TSr90sTmduujNMvaNxmBg9Pvz5c+YPJxZrFJeS 7PQ5njY1rtuTK721qTcp2KV9iOBcHzoQhcYSgOeTIJQDiEm8sqY8ij9Op4M59/9XErmtx x1xp8dI5Xy7DKvipVoLeYW/K5XSwbZGKaDU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Some RAW ffs parse section for check UI section will encounter dead loop. Actually when FFS is raw FFS, not include UI section. Change-Id: I40e1cbb988bed30d8757008bad9074bc11eae135 Cc: Bob Feng Cc: Liming Gao Signed-off-by: Yunhua Feng --- BaseTools/Source/C/FMMT/FirmwareModuleManagement.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c b/BaseTools= /Source/C/FMMT/FirmwareModuleManagement.c index 89a7533deb..c8a53d3def 100644 --- a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c +++ b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c @@ -1,10 +1,10 @@ /** @file FMMT main routine. -Copyright (c) 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include "FirmwareModuleManagement.h" @@ -750,10 +750,16 @@ ParseSection ( UISectionFlag =3D FALSE; Ptr =3D NULL; SectionLength =3D 0; ParsedLength =3D GetFfsHeaderLength((EFI_FFS_FILE_HEADER *)InputF= fs); FfsFileSize =3D GetFfsFileLength((EFI_FFS_FILE_HEADER *)InputFfs= ); + // + //if RAW ffs, return FALSE + // + if (((EFI_FFS_FILE_HEADER*)InputFfs)->Type =3D=3D EFI_FV_FILETYPE_RAW) { + return UISectionFlag; + } while (ParsedLength < FfsFileSize) { Ptr =3D (UINT8 *)InputFfs + ParsedLength; SectionLength =3D GetLength (((EFI_COMMON_SECTION_HEADER *) Ptr)->Size= ); Type =3D ((EFI_COMMON_SECTION_HEADER *) Ptr)->Type; -- 2.12.2.windows.2 -=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 (#61396): https://edk2.groups.io/g/devel/message/61396 Mute This Topic: https://groups.io/mt/74933847/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-