From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.20173.1591576411390103466 for ; Sun, 07 Jun 2020 17:33:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=S7vilIa+; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: yuwei.chen@intel.com) IronPort-SDR: s2GDmnkP29wCqNxovsTPpkYOWbaesJfN/4NYDoERUegrlyz1vUb0rR0x7Zgj1UUga/VyMJCEyz guDRl5WHj63A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2020 17:33:24 -0700 IronPort-SDR: MWymVC1rTTR0dkxGCeLFMV1snON8Hk4/HhMwjsw/SrXyzQ6hojdedAMEGtRDQS/BG6L8xdcidS D9ADNLa4pdyw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,486,1583222400"; d="scan'208";a="472405645" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by fmsmga006.fm.intel.com with ESMTP; 07 Jun 2020 17:33:24 -0700 Received: from orsmsx154.amr.corp.intel.com (10.22.226.12) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 7 Jun 2020 17:33:24 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX154.amr.corp.intel.com (10.22.226.12) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 7 Jun 2020 17:33:23 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.36.57) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 7 Jun 2020 17:33:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JkmWn5IgglIeXwPbItj5Cfc2lLhh6m0rAg2C1Lpv3iOBU2KqQ6fvVyeRdnsWARjAgymTy0yY5Oglu3iMLPamWtremLsmg8cKGvtYVxXJpgqZJLIenCRXQ0oIW6Wr81H3gzkCdOuUlE3C4fITrDi4GFaac2cNZ28lTSSUPSBfxVlr+WUt44sIw6dBIgkXFxyRZO+7IIxcS+Jb4A5C9881iRF8e3P6KfT6K/ElbU9yCN+19sCKYnik3paFyKmqtOKl9Yyssg9RPmy6UA0SVSjnUObH1Mx8lihGEgTtTYDM95yMwUo13LjLGwySqD147ICJG1/zgWyXRppFM860AICJMQ== 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=JY6Q9mikSW4NJvOcB+xP+8rJVNpegUGUqkR9cqjtdp8=; b=lAi+TzV2/6Z6KV1kluZAF6+lzuhgVeayU4S34HrXoWcjwzCxoJEHkZkchm/z4hm2X6vBdS8/wNmrh1+1ojB3j0eTDIXnRH+bEljJLzlutU4wvR271hdnOtQ9/wU8BDnQOxXldBXrddSuiogfvofiIGbj9MQoaDyrvjUFCne64eVXSwHhFRIy1S8kfedTYAYvfpKyEyny94iUFGDsqtWdq+KEnE1XzuoMW0NJadNBSbcJ8FOpFjyMR+Hb+4iND2peS8jxMZF99gqf2lZlw83vhQM4wauE1BJ1q53pq4aWcYE3cjjrhh/Qh3IerZRmLOlqO4BAlmbOUmTel+DBMyMwVQ== 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=JY6Q9mikSW4NJvOcB+xP+8rJVNpegUGUqkR9cqjtdp8=; b=S7vilIa+pGyo7v2DgZ7tI/rqob14p4g27H0vAIGC3C8fqIQGFzyxlmXT4OyC7G7STpySZVob4ukC7+gxjkrEDR+b3cfs5wQGmQA6Ulx78//LBtU+LcZfkHxww9SfyjWh63eZVjiJAZ6iPbmCeDdb5lfEKXa1ZFdIRaNnWba322w= Received: from DM5PR11MB1594.namprd11.prod.outlook.com (2603:10b6:4:5::16) by DM5PR11MB1882.namprd11.prod.outlook.com (2603:10b6:3:10a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.20; Mon, 8 Jun 2020 00:33:21 +0000 Received: from DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::25cf:8c3:b35e:35dc]) by DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::25cf:8c3:b35e:35dc%11]) with mapi id 15.20.3066.023; Mon, 8 Jun 2020 00:33:21 +0000 From: "Yuwei Chen" To: "devel@edk2.groups.io" , "Feng, YunhuaX" CC: "Ni, Ray" , "Gao, Liming" , "Feng, Bob C" Subject: Re: [PATCH] BaseTools/Fmmt: Fix found the next FFS issue Thread-Topic: [PATCH] BaseTools/Fmmt: Fix found the next FFS issue Thread-Index: AdYlz4lL8B7hu+H4QOSGw1zwvPIU4gXXMxKQ Date: Mon, 8 Jun 2020 00:33:20 +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-reaction: no-action dlp-product: dlpe-windows 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: aa92c53d-06d8-4717-dc49-08d80b438bef x-ms-traffictypediagnostic: DM5PR11MB1882: 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:2803; x-forefront-prvs: 042857DBB5 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hUl7JRpemp4mPBWPKvnndW634krTwBaUSDkdaRs33OQwdh4Jl2HXdunWqzp21dh/rvtJ+eX7T6OUBwgQmTzeLfOFhxvH52r0lPE5dBt1qVfF03ICdO3GJ27pdyszD3mxshZ/PRH3ltFd8fki8t5C/7tMb//Zpkemx4hllS8exOvGIr+h+G30/riEzQqqW4BsBl3yk5H+BiGVcMTB+cwCULh4qFOrSBvtLVnO0WciOQsjDdA4FuCYtkAybj+gTMmoXNvxH2tFb3QsnUK5YL3Ummf2XkvJ5COJPutIu1u5KPoEnYbAlUGIvyLPnQ4NOhEp4QNAHXbvM33/anFC8RKVcPGjxlrT0nwWtMDlDOZIXupY60+Pl8k6gyfY+qg9beQM/2gYfOz9qKHEkZQZgCRFzg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR11MB1594.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(396003)(376002)(346002)(39860400002)(366004)(136003)(5660300002)(66946007)(66556008)(66476007)(7696005)(26005)(107886003)(478600001)(66446008)(64756008)(8676002)(76116006)(6506007)(53546011)(9686003)(186003)(86362001)(8936002)(966005)(33656002)(83380400001)(52536014)(6636002)(54906003)(110136005)(2906002)(4326008)(316002)(55016002)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: RJCBNGRVTfxT7gmvYZaBs2gNW+TTxJZK4G1s1K5Je097oTDrcEtm6IG8KTJ0fS+G3CyN4kWE8TsXlH2BTxNdFL06iok0fk4dpBbBlYqS+eOqPGv3ap+wI68CplYfYEP3c7L0wfKaPXlGxQ4wKM0vk1osmc06gny7VCrJjIrryf7NC1f0wsIFHC0V1DIqL8sw5gxSnm0qtFl/2oYSH4JO4MmhQaXb5oNYWnmCaOr5dVgVGy+DaNt1s8ctc91kh4ZR7U+dGEsrKJMgRqp1Y9Rh7uoZCKuZsvcrr4ZxCoWQuOFyyy0q8NXYKGy8EI1TOI2XT35TRaQw/RhqF6Ij2lLWm9UpKsl6X9TWhgTB7frlKWzBk5DRN39XHd0ahKqbEwntBcJA2KbjVGzX3qHSmLNk1aePRGzFPQ7YykSQmgcjMZxVJIFy30VIiOafCHdc9aKtrG17fqHy9r5gHxdtAwa6lp9ygWGRIpBhHpVhgd/MA0uETYZ4tMDrUzGqmMAUSZHV MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: aa92c53d-06d8-4717-dc49-08d80b438bef X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jun 2020 00:33:20.9303 (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: 2C3OVcDUrzjIryS0MoucFoth/YT93dJ3a0bE5fmvgZNd1Zu0WIfE+8Is4KWEkePNNfPKorD6nGKg9LQ0KS8lGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1882 Return-Path: yuwei.chen@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yuwei Chen > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Feng, > YunhuaX > Sent: Saturday, May 9, 2020 3:01 PM > To: devel@edk2.groups.io > Cc: Ni, Ray ; Gao, Liming ; Feng= , > Bob C > Subject: [edk2-devel] [PATCH] BaseTools/Fmmt: Fix found the next FFS iss= ue >=20 > if the ffs size is invalid, break the iteration and return NOT_FOUND. >=20 > Cc: Ray Ni< ray.ni@intel.com> > Cc: Bob Feng > Cc: Liming Gao >=20 > Change-Id: I9e320d6176af350ff208901209f3f6c89e4e1924 > Signed-off-by: Yunhua Feng > --- > BaseTools/Source/C/FMMT/FmmtLib.c | 7 +++++++ > 1 file changed, 7 insertions(+) >=20 > diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c > b/BaseTools/Source/C/FMMT/FmmtLib.c > index 9ec511ef06..6858cfe778 100644 > --- a/BaseTools/Source/C/FMMT/FmmtLib.c > +++ b/BaseTools/Source/C/FMMT/FmmtLib.c > @@ -1769,10 +1769,17 @@ 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 the ffs size is invalid, break the loop > + //the size defined in EFI_FFS_FILE_HEADER is 3 bytes. > + // > + if (fsize =3D=3D (UINTN)((FvbAttributes & EFI_FVB2_ERASE_POLARITY) = ? > 0xFFFFFF : 0x0)) { > + break; > + } > if (!EFI_TEST_FFS_ATTRIBUTES_BIT( > FvbAttributes, > fhdr->State, > EFI_FILE_HEADER_VALID > ) || > -- > 2.12.2.windows.2 >=20 >=20 >=20