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 B2507AC0BBF for ; Wed, 13 Mar 2024 06:55:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=wOM/xJBW+GoygdXWiwW2VajnHKGEwhBxep4X5YaIRVI=; 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=1710312916; v=1; b=HcoDr65lMC2YCrFm6Nf+NZM/lmuRSXINojMJRVKV11RetaT1iTkS5quQWt2Ec0DgbYFEdyYZ THiyv98X5eRhB9nPD+v5PQK2U9OiDvPyqWCfCPx7cP0Kwj2fgygIyFq64BvkV8WXult6jIQ0f0m cXJJLeuSIh+ANzzZ0NjzgGzLOD96iz+MnXjTlBevT164knNwmbDT5BCFhqsVVDiVyHHGQE8Cy0E sVnlcBxmCtQokirswxiF633jCGg7O2+QvoPEyWeOG8NV2nXxl2XV5Ot4A26ljCPqoAkZ4U4TOc1 nQmPDaKMZIrvUtqmdQV9t4SphOzbK8Gu4eerV9cR3s7Zg== X-Received: by 127.0.0.2 with SMTP id 5ziOYY7687511xJAWOsIubMV; Tue, 12 Mar 2024 23:55:16 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by mx.groups.io with SMTP id smtpd.web10.10508.1710312915570016889 for ; Tue, 12 Mar 2024 23:55:15 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,11011"; a="5181516" X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="5181516" X-Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2024 23:55:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="11902192" X-Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmviesa008.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Mar 2024 23:55:15 -0700 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) 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 23:55:13 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX611.amr.corp.intel.com (10.22.229.24) 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 23:55:12 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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 23:55:12 -0700 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (134.134.137.100) 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 23:55:11 -0700 X-Received: from DM4PR11MB5280.namprd11.prod.outlook.com (2603:10b6:5:38b::18) by PH7PR11MB6980.namprd11.prod.outlook.com (2603:10b6:510:208::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.18; Wed, 13 Mar 2024 06:55:09 +0000 X-Received: from DM4PR11MB5280.namprd11.prod.outlook.com ([fe80::507d:aee0:b06b:77a5]) by DM4PR11MB5280.namprd11.prod.outlook.com ([fe80::507d:aee0:b06b:77a5%5]) with mapi id 15.20.7386.017; Wed, 13 Mar 2024 06:55:09 +0000 From: "Ashraf Ali S" To: "Lin, Du" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "Chen, Gang C" , "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+uWUAGJO+qC0GFIX3lpuzI8rE1PAmw Date: Wed, 13 Mar 2024 06:55:08 +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: DM4PR11MB5280:EE_|PH7PR11MB6980:EE_ x-ms-office365-filtering-correlation-id: ae0e2b91-ad28-4286-f895-08dc432a85a2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: au+KP9093mRszKYE9EGgw/4Z6Aetbwm5eqI76SZ6pyLK8XF35eLGc7fRcRKx8eh3dU4aUH+iLHFxWVztg4/DIFGuXMF1Q14HckTOvLU1en6Jp4CcF73fMbozGxqYRLlOIsV2NiDohJAaNQB20Uv9iVEWsKqwWkL4Ji8CsCzdf+lEnmv6SoYMc+9pRpU3qPfxvEInpP9qB0fJ/IOxV5uoz/9apUBy0IZLmUKWIuK6ErEGgf3vQgvUMwblTU0qH8KJtvVy/YDLDFNRcWrV4ZxU44TFRNT7oVO7+HhqEnSTtnvipIRpM+j8y6xa3GdaUZIvvL+luT4O11hEnDIVG1WQ4AaP/VpUP4pFAgMO08Fq6aHdurnTXZq34vEJMqfiPgKd70aZUDB2dbNQDgugITfaFwCjaS1WAMNSl7k6X/3/LxQM/q5fXVdkuG2thw+Bkx5ctaOTiXsGLbJ3iT5TP+olAXC3VjhVcNxp/JMi50rD4Hv030SkpQGQ8HSdLXajY+wXmyV3uPVJUo3X7DYZOmRoMB0lU4uxTKwPkpST/xD0k2euXCvZpa0L+gtPGDqlUJeP+9Gv92OaonguxgPnkiH8O/Ot+XDSgqFMK49g6OeNW7mH1BD0YhBfoDzi6IaqtUBMs+Fi3ANDzwB5uvkiMODADxZ6PkFp1EdIhf1COWxPMOY= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?QKXAq+lMc+e8gm45f17AdN4SrI7B2N/DYs0RXUUnIEAX8bQIgU0EyQXjoyuM?= =?us-ascii?Q?DLZTrx4JPzs+SnajpDRd+tc9Chdx6amxoqXa2LUl6KK6ssnlzLIyV5dZxFHz?= =?us-ascii?Q?9DGko64vt619fw7DuBvwk4t5zCClUhQT9ah2Vq0zaoSzHRrrM+V2LrKMd4cZ?= =?us-ascii?Q?WSihcGur+EdyHBxhaaqtuNqki0L9p9kp88Fs3D1HK5aGSG/fEglRY89+i4jm?= =?us-ascii?Q?ckIzlna1vqhQFV241sgpsYLAKbu4/sSjhCO06a1B46tO6uX0E6pmDYAQ9ZM9?= =?us-ascii?Q?q3DSb7I+E91/l4QLQMCyrKI/CBKIpUT/Jq8RGW3C8ZurrZiMhNMj8/WNU8yI?= =?us-ascii?Q?8GDuhP8a0nNv3benrofDkMHvoIjUy7zDeW2zsTXI/sd1nJhEgNL/Zlhp3T9T?= =?us-ascii?Q?LaF+qazuAb/aF+676bhHYoYl/qQ/eBV/el6Bx29zhjtrP0MHPq2QsXVBUyWs?= =?us-ascii?Q?t2QEFU7+zTThB3DNdi/HCH8KkDcEUuI6Ho+lkhlupNClz13HTTsHp3YRLsoP?= =?us-ascii?Q?GbufJvUgNIWsw9AWj0w296vzjqSVqe6CzTEWyZgoalOcURNLEulKnJp0VDXk?= =?us-ascii?Q?3HZJWGUqJqioZhtAvMiiDz9Gq7x7N9F3BvbXT1yLKYpzJ6tj133yvY2Kr36P?= =?us-ascii?Q?27feBldm6j7MN7xizQX43lNnT1FtGCtDc0YZyo/7QnXmmBBp0+D4DXyaeyD8?= =?us-ascii?Q?6msBOH1zBWAInv/LY31XEfKjomoeK3QdHiTyyCoCcJk5I3ZEnviXgln9htQB?= =?us-ascii?Q?0j+ijzUU9QQcmicLHHbQc4mhehb02VWJ2WRoXbyqUGiDVsYWszxVOh5NAqkt?= =?us-ascii?Q?MQNFQK/CEn6h912YyAcx6AezQJ6rZ1AXh8cBwDLJYLcOZES3cPMBxgw3klHp?= =?us-ascii?Q?FXg83URoFWk5trPx35V5TCsVWCilZH2sc2SyXCdKldccadCf/yfQRiN1dre4?= =?us-ascii?Q?xpMjdw5AfGBTRU7k1MfIGeuVd8wIC6ScrVWgJkIMpW3VQRVzqcnS7JdUmaM2?= =?us-ascii?Q?r1UXh4v4L6j1joiMIZd4y5Nfe757gGDecfDv43CjCWwzJ4/xqEdspZ/POCjF?= =?us-ascii?Q?W3/RBRApao0RHAYBNWcL4c7HVMBzEUirtu6O+MOcdtbRYwWLN/0Wqre24/xf?= =?us-ascii?Q?OyFXFduiWOfm6JdAbHeui9kxj8K3QZxoXBGo1wclsHRKuNQrA8vsA9nRC34B?= =?us-ascii?Q?r7DYPgANoN2QfkLywVDGxKhygmiv+3kNFongJmUe8pu220CwQOBhySxyZVzK?= =?us-ascii?Q?oY9dRqYcl/uc1tOIi5y+H6IH0MmDqh2jsV41XG6+nS/eYm1iwsqZhJV8vjBE?= =?us-ascii?Q?Ook64l7Cf8oGZIrQCOgEnx55HtGKl3rzVXEOoqi3paz3RMTwbyvwbVhXSkYW?= =?us-ascii?Q?rnhI44DneK7bLkBMve8pnMgvf7jiwHBI4mbzUo6xACWJOPnp68IQofCdJSno?= =?us-ascii?Q?SnGikDRZW33TELLmskE4iRQMo9j6BKxW7gzVMBOy+a/cB9uHxYbYqrmVbkn3?= =?us-ascii?Q?JvWhXoCxPpmkLfM9+LsF96BTlQThce/1Y6w+rUW+j2SDAFrqbkBQSWl59LkU?= =?us-ascii?Q?JFlFHTVyYDA8YsdmMqkA9LIvDWddJrJUcD0blkn4?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5280.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae0e2b91-ad28-4286-f895-08dc432a85a2 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Mar 2024 06:55:08.8967 (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: pRuzgRfp11hNu2HU7YKxNsYhwgnZFULxof6v7Z8dILqvRhyA3+Yu1Wr6rGKg41v7d48m/Q7QaahP57cN8eYBMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6980 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 23:55:15 -0700 Reply-To: devel@edk2.groups.io,ashraf.ali.s@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: IJ0HbSzXDT1aHAP9fiMPYvA9x7686176AA= 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=HcoDr65l; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: S, Ashraf Ali Thanks., S, Ashraf Ali -----Original Message----- From: Lin, Du =20 Sent: Tuesday, March 12, 2024 2:58 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 (#116707): https://edk2.groups.io/g/devel/message/116707 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-