From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id CBEC2D802AD for ; Wed, 13 Mar 2024 01:46:11 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=8xJopgCD9392xenvfkWNFD2yeVEfyKe/ZGMSbrW9mq0=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1710294370; v=1; b=bnrircQfIoj7CHXP6X+aohFBOlPRN56DAD9IybIkGBqMG7hR0lF9HzCp+W0g/T2+Nglm2/zJ cvqveeNGqJmAmdxBM+nEL1vIkjIzJz3sHrwr/XB6xCoTZHUGSFQMByBWLcMXMBI+dD1B03nEKVP ttQsmIyuZjtre7R5o7N+eeRej7u+oHfbF8iut4VL3Zc4KyiILJOk8trOC7x7OZ0Qrx0P0IlXqNH lqMrHrUepawtMZ1hLm1nzQSf9k4lhpRNqlpyguqXIJeuSt8gvhEWgtLNbGS+sXAJNf4CAp5i9gk Cpd9CqVCyOUi+A4I2N1dTWa+TIfnSkxNqcPNF9y1h9nNA== X-Received: by 127.0.0.2 with SMTP id 0AnrYY7687511xkTMpCu6oC2; Tue, 12 Mar 2024 18:46:10 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by mx.groups.io with SMTP id smtpd.web11.6581.1710294369394414819 for ; Tue, 12 Mar 2024 18:46:09 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,11011"; a="5164125" X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="5164125" X-Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2024 18:46:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="42670074" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orviesa002.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Mar 2024 18:46:09 -0700 X-Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 12 Mar 2024 18:46:08 -0700 X-Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Tue, 12 Mar 2024 18:46:08 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.168) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 12 Mar 2024 18:46:08 -0700 X-Received: from IA0PR11MB7935.namprd11.prod.outlook.com (2603:10b6:208:40e::18) by DM4PR11MB8129.namprd11.prod.outlook.com (2603:10b6:8:183::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.16; Wed, 13 Mar 2024 01:46:06 +0000 X-Received: from IA0PR11MB7935.namprd11.prod.outlook.com ([fe80::57c1:4359:ead2:d868]) by IA0PR11MB7935.namprd11.prod.outlook.com ([fe80::57c1:4359:ead2:d868%7]) with mapi id 15.20.7386.015; Wed, 13 Mar 2024 01:46:06 +0000 From: "Chen, Gang C" To: "Lin, Du" , "devel@edk2.groups.io" CC: "S, Ashraf Ali" , "Chiu, Chasel" , "Duggapu, Chinni B" , "Desimone, Nathaniel L" , "Zeng, Star" , "Mohapatra, Susovan" , "Kuo, Ted" Subject: Re: [edk2-devel] [PATCH] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() Thread-Topic: [PATCH] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() Thread-Index: AQHadF+uv+yEOs08VEG+nw8BK3SEebE056Eg Date: Wed, 13 Mar 2024 01:46:06 +0000 Message-ID: References: <15718c1dd224a860cbf24f9d1d5d8e4afd14ff85.1710235504.git.du.lin@intel.com> In-Reply-To: <15718c1dd224a860cbf24f9d1d5d8e4afd14ff85.1710235504.git.du.lin@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: IA0PR11MB7935:EE_|DM4PR11MB8129:EE_ x-ms-office365-filtering-correlation-id: 287f29d5-c608-47b9-f99f-08dc42ff5948 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: F+NYLvPxz3oCubun83M1t4f/T2O2vuUlAi0/8ltZIU3rppykvYVEqUY7dUDAwEj9TphIPfanC/Yghf5uDcsQsLC7cdsz0GK+hP6YfBhy/F0FxFeQv1q6bAXDiq6pg/XfW3hCVZ8oTzpCLan5hGgvxARJlc0Pz/5MNdP4Hmxaj28kpj9JFQaGIMzRkQHFlZ9TabejvxI6MkcT5fvQTgARiycdOHbOB9emOlJpGOLJrmeGN9fjEYQoAA1lGX45ZkmBMGcM9ys5W2XyiWebdrKyWKbJm9x98siuTS+x9E3AdLO/b4uF+tFINruidbWh8W0DDMtbKV6prWqtt6LxrpYWC8Q+9fbyrcJUmTOEZ/GLdFjDe2eJMCEW3bNbmCwQBcc30XNp4NG6Py16okcRx23+MVjEPx+9QbFNBJmd+60GqYBzEO3NbI8Ik1x53Dv/Ltd/rM0XQ9+khQOoll3EpCBpHKs6OgwHRX37QywjXvRVRahsxB7feLaG8hPhU/KwlEdGUmVkKVEbCqOFjT6lv+uvLWp0Ggqk4MVGB5HEyVKO3sySQ8JT9U6B2LXIFILhFaDsfW63BaDIVTsh2Q0ZHad0O1DaY4kpX4qb8O7fgb4dgftchwDwSDVsTiR+/qu8ilXwJTTLg0RrZW8eZYAnPMSzPKQgGOFi6ICsGbA6i5BWo2g= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?/eQ5hY/9ShPs2g2BRM3nQBpa0ASdACRGXY9QZyCLEdt3dipwiJYQcWUdmUvr?= =?us-ascii?Q?JEVEY7lvnlxLZr79s0ykar1KB1QDipBJODyQsA7NsWxAtD7ixmfdsBd1yj+k?= =?us-ascii?Q?wRa/gxr3SZxgBvXQS/eqKvcVGAMJ4GRiEMwwY/7maCHSYbwiYq/Fbj4NOiM+?= =?us-ascii?Q?mUdN8qfT035/HX5mqAw+Ae+AIF5srakwQ8I2RnEWyYgp4E8x6gBKD0v2G0t6?= =?us-ascii?Q?BnWuIPKvS4oji6MnySLtuBs4FZrsDuBbZFLJsYeW0Q78l/78Qd0tIBVnfrqj?= =?us-ascii?Q?iZ4goHMyN+xmzuwb3cvgGguSKF/sGaTbLMT7OzfzPcKI6jQhRmLotlXEotEW?= =?us-ascii?Q?ImcKKddkOE6abLlzxOMECmRIb2CalN7WxN1h/ZEkUU2/wf3ogY55ggiQa2fT?= =?us-ascii?Q?7xH092ORr1dHp7Km7leF935RYbey2pmj6SHlDDGdY500fOoUhqL71/SUAGib?= =?us-ascii?Q?NLBXX+DTJmZZV8O0fIPJPcT+3N82JiowNHQUV6QI5HdvyAM837TAWPAPyZKW?= =?us-ascii?Q?g+IhPtmcyZDiu/wBtWAn5C9h5R2aYD2HlaqlWOxQxJVVQHV76Or0GsSdeG/V?= =?us-ascii?Q?EcGn0d2iCREfLfLfTTGtTdAc/ywq/wNLXCkv0jzc35wTnfTysgt5M7Pis+g0?= =?us-ascii?Q?PBA9SVr2ZDqWUTUwnUnfyrOSqJlJagYG+bzbkUeVUX14JY++TckBQuc2eEBY?= =?us-ascii?Q?khRA6jzCoACPfcdEXiGmKKivn4w3NUdc1s4XTAQZ7jGmNnDW1koann/6XC1l?= =?us-ascii?Q?LlokrZuFfEDEFBV181syk5Z7krUisVa3hlVtodx50AUdCsl5T9QnZ3EejRwj?= =?us-ascii?Q?kXzMUnHXEoehSqq0gQfqLNn6dHskT99M1ghd6ZPUJlclu0k9ZdVUF/YTDyv2?= =?us-ascii?Q?actyqzrorma0a85P16hnqLhJOzn6M/t/UNsgnA5I5sowApfzK9txpDFR0Ca/?= =?us-ascii?Q?qzc9aPm84pezcqmirX1tQ3GWgHI+tPMHnJJ7Flewb7VAqktPe6AYcf8unI9H?= =?us-ascii?Q?0Ytm1dGjKumBK84t0QfVGqvjDKbdfq/5qwb+7f/vvnyG8bd+nczYNcdvHAR0?= =?us-ascii?Q?saGTA1b93m412bFTYd2ajE1WV4eyqeVPwp2Bfrb05KjMzjbA3X+rzTBs9BmQ?= =?us-ascii?Q?u1xRKNaSCyPNLP8/Xx+SVPgrqfsQn/eJIDuuJX8nNV82zPi9Vel0UlaKPzzJ?= =?us-ascii?Q?RyuYpe9QO8+DehzX6QDh5r2RlhaE4b2UOyz1br0/oA9c0CdbU6i+XG0uoA3D?= =?us-ascii?Q?MDb0vOuDGCPkWb31qkyY6XrkwVCj8hmp7tYZ+LOsfEw4husaE4PEgza1njI9?= =?us-ascii?Q?w5cBfvWE9yZ/v34I7bk3CMA/mSXdoWgrEm67HcocDY38XyUrxTgEIUUUnWyZ?= =?us-ascii?Q?wxyNHWsRGx3XnpgwKgpfhglp+5FQ5nh55ypZuERxrny1d8g4MSq7NqyJDO9n?= =?us-ascii?Q?aqwBFaGR+Y3aS1iYuiGtuum/uutpU12ovrffl747EgvwwbCTZPiLcBe5rVUr?= =?us-ascii?Q?3YDHZLm49fHLRtPWQehKZHigpP4AjNj0fFngSfFsQIqBWFvvu1LJvO9fp4zi?= =?us-ascii?Q?Udux3gSizsPyiNj0TYLdO6jxAeO9ubU0/isZFrCE?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: IA0PR11MB7935.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 287f29d5-c608-47b9-f99f-08dc42ff5948 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Mar 2024 01:46:06.1304 (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: JNbDgAl2S2D9FtQPyQrK21ntPyC6kWS/wFod+xHcBChtxGiIGVnDFqnn/QEJKi68axGZWIyDQgoRdKFsJW0/Bw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB8129 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Tue, 12 Mar 2024 18:46:09 -0700 Reply-To: devel@edk2.groups.io,gang.c.chen@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: BS0YYxwiulp0TPvOSqhUB24px7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=bnrircQf; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) Reviewed-by: Chen Gang C BR Gang -----Original Message----- From: Lin, Du =20 Sent: Tuesday, March 12, 2024 5:28 PM To: devel@edk2.groups.io Cc: Lin, Du ; S, Ashraf Ali ; Chi= u, Chasel ; Chen, Gang C ; Du= ggapu, Chinni B ; Desimone, Nathaniel L ; Zeng, Star ; Mohapatra, Sus= ovan ; Kuo, Ted Subject: [PATCH] IntelFsp2WrapperPkg: Error handling of FspmWrapperInit() REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4701 The error handling of FspmWrapperInit() is limited to ASSERT statements onl= y, which only works in debug builds, but not in release builds. Fix the issue by enhancing the error handling of FspmWrapperInit() to cover= both debug builds and release builds. Signed-off-by: Du Lin Cc: Ashraf Ali S Cc: Chasel Chiu Cc: Chen Gang C Cc: Duggapu Chinni B Cc: Nate DeSimone Cc: Star Zeng Cc: Susovan Mohapatra Cc: Ted Kuo --- .../FspmWrapperPeim/FspmWrapperPeim.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c b/IntelF= sp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c index ba0c742fea..356baeeccf 100644 --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c @@ -196,13 +196,21 @@ FspmWrapperInit ( EFI_PEI_PPI_DESCRIPTOR *MeasurementExclu= dedPpiList; =20 MeasurementExcludedFvPpi =3D AllocatePool (sizeof (*MeasurementExcludedF= vPpi)); - ASSERT (MeasurementExcludedFvPpi !=3D NULL); + if (MeasurementExcludedFvPpi =3D=3D NULL) { + ASSERT (FALSE); + return EFI_OUT_OF_RESOURCES; + } + MeasurementExcludedFvPpi->Count =3D 1; MeasurementExcludedFvPpi->Fv[0].FvBase =3D PcdGet32 (PcdFspmBaseAddres= s); MeasurementExcludedFvPpi->Fv[0].FvLength =3D ((EFI_FIRMWARE_VOLUME_HEADE= R *)(UINTN)PcdGet32 (PcdFspmBaseAddress))->FvLength; =20 MeasurementExcludedPpiList =3D AllocatePool (sizeof (*MeasurementExclude= dPpiList)); - ASSERT (MeasurementExcludedPpiList !=3D NULL); + if (MeasurementExcludedPpiList =3D=3D NULL) { + ASSERT (FALSE); + return EFI_OUT_OF_RESOURCES; + } + MeasurementExcludedPpiList->Flags =3D EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_P= EI_PPI_DESCRIPTOR_TERMINATE_LIST; MeasurementExcludedPpiList->Guid =3D &gEfiPeiFirmwareVolumeInfoMeasurem= entExcludedPpiGuid; MeasurementExcludedPpiList->Ppi =3D MeasurementExcludedFvPpi; -- 2.44.0.windows.1 -=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 (#116699): https://edk2.groups.io/g/devel/message/116699 Mute This Topic: https://groups.io/mt/104886876/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-