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 1B0417803CE for ; Wed, 13 Mar 2024 01:46:24 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=IwI1QZGOoeu6Ca4GM/FwLXG35BOF46o+dLSWp6Uotw4=; 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=1710294383; v=1; b=i9au8GSxetjhCsPflgrT/qzVNk5NfeMMNnY4DhJGI9RAdfwk8ZeExMvbxyvMOGac2JaY097+ R/TO1MTFg+TfovYObB85e0Jii7oNaQicby3f23SiLfLrSOs9wZeN/496MEgKakMHN7poKfUZhxP iJ89BXt5mr1nWsX/bGrVEFxc7qAh1scGFheRBK8pf06nyrcL7BZMPWEH23bfZslXke+Di4H1CY3 leWsTejeqmDhFbBbsqnjg5mlq+ia6sUc+Q+ZFbVF8ibYNg/eWYAURaU89AYmzeBJtbqjHkj07ly nYTpt+UXI1eVD9/M1GRv3IHgyj7IsZoqRFGjz/R1WDy7g== X-Received: by 127.0.0.2 with SMTP id wsysYY7687511xGXtlVt5HcS; Tue, 12 Mar 2024 18:46:23 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mx.groups.io with SMTP id smtpd.web11.6588.1710294383083644949 for ; Tue, 12 Mar 2024 18:46:23 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,11011"; a="16484914" X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="16484914" X-Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2024 18:46:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,119,1708416000"; d="scan'208";a="11667912" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orviesa010.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Mar 2024 18:46:03 -0700 X-Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX602.amr.corp.intel.com (10.22.229.15) 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:03 -0700 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx602.amr.corp.intel.com (10.22.229.15) 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:03 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (134.134.137.103) 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:02 -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:45:55 +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:45:54 +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 TpmMeasureAndLogDataWithFlags() Thread-Topic: [PATCH] IntelFsp2WrapperPkg: Error handling of TpmMeasureAndLogDataWithFlags() Thread-Index: AQHadF7bHfDIo/Msn0Oerfjj5R9rNLE0503Q Date: Wed, 13 Mar 2024 01:45:54 +0000 Message-ID: References: In-Reply-To: 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: d6c6ed7b-071b-4237-3c0b-08dc42ff526e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: eH9oSvCI26LzINWBXw5tuyJ3TMoZyKwA+02hw3V2QC14eSDDkWGXgM9IGmT64pHcL4RPtyal0hz11JgOdpX852Yi3BsppNg+5F9j2QytYmEQqkGlWHhFJUH8iFja/JzFWU0PH0M/mZwiWRpRjGPiiu0/+pm+dUTi+Y83zAXx9aQzpAgk4q5bk+ZZc8ZNXjZnV/mJ9X2jITh4RB4GHjP9xdudysIR+RwV2ujOPEKq5eJ/2QPrCKJC46Dzt6intpObuDe+Wi+UklIGHVNFFBotn4oZt+mIcY0TgkEDr2D0vhJ/I9h7R/mfh3nqP7tJSYkfvFddINrJgaoPdIXqWrgWl8XMMwQ51zxLtJa+g8XSqM47ZCgpRDfZKko6BSZ/LATJSlrXw0CLQrKnvBAOBROKCVG5jOrsq48uDbjTV6zOEA+46JSZ1XVWYnQ595gA+zKaKDF4wxA/LGElqXs6e9fhihrnhvJVBi9vI5WIhdaVjxAWtCqgaX6V9Wete7x5y4Qu/dYfrRmDno4JVv2hCfooNheM9EBHPUQI9tCVKMcURtBBoHofBlIIhCA95FDeUFAbV2vpsAu3uADYhk0SFUzJtGYDQIqJZiuCaNWFrvNqepHG5EO3Ccs03gqj/MAML9IUQanJB2LKtFNjJGEaRVIO3nwlWPexhYEqoLWyIQ92VAg= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?e35ysQBfxdCkZoUQgu9CXM4GpRabQyDcS+pM1qi0W0zaKE5mUur4sREYBm3n?= =?us-ascii?Q?d1G/c9TgNbrhcDx/hoHJsr5Qzoi63EAKk2Y0NncrJ9R+XoPVQoZRUNw6cHXP?= =?us-ascii?Q?axHPbul3xoJzAsAML1+K2RGjvIOxuLDkTPnr2hyAKnSCws1D49D6lPr4MnAo?= =?us-ascii?Q?UdN1+Nu8v5GZ7mzRzyoUbof8XzBf2HSk/cQ3s91y8WxYym7c61QLMk7iMeT4?= =?us-ascii?Q?QkOu5LuHi0YSN17NKL8JUAKs9dyqPIpCmBnN99WvdxeKQOLKK27EnFR2wT2I?= =?us-ascii?Q?x0B/9qnzcv1ai3HFtPAVLSB5CRW3foxuJtAhQwSTHhPUOnwe7YfmpMFFwrHK?= =?us-ascii?Q?5I3FufICG33Mr31oUxkXfTGADxni6ButJXNcKH6xbf7PbTZ1CVaE9gK+5qCT?= =?us-ascii?Q?gJbSnnokWLTdNHPSTS0FojTEQE9pEfp912Ku7uLVIl3vxU8vkEjrQ3afKPh2?= =?us-ascii?Q?+JMFQq0M6Ze0djO7IXEATzj0sWZnszvaF/DexeI+n+QsTugT3CnJpm6weYpS?= =?us-ascii?Q?4jV49PdJU6yLto/zA3o0LLP+nNhqhBXawwLbPYfNgPQcChtbHX7Nf4KItHp9?= =?us-ascii?Q?jlg3Otn8flbsZQRJBeh3AWsh2yV8q1qQy+CW99CHFRZhWTTz/eV8z9z4o7re?= =?us-ascii?Q?7mcbfNOQkBvCtQVZA7C4DpextFtlMc8U2OPkc1piZ6G+2NwpM+lgh0nd3jaw?= =?us-ascii?Q?Zhvhs8a1kAWSKtp3n2KtqrgXMVOHF+mddzXxNmQQ3AcApcXTb5w2tnD1NfDt?= =?us-ascii?Q?OPm1QgsP6FVieOy3RdXM/l1rv4nEy6oEwNSKkbDcC+2hA/k3L1AwiYLqs79s?= =?us-ascii?Q?j5T2AeN9fs4J8u3NpiQG+WFgwMLVT1rX6stkVTxLtN5J1jA0DpRQStKAEhnW?= =?us-ascii?Q?mJhZhQcTnNSp2otKuOTfczE46TmBbY0OLzSQkYGlShUk3uEQ/E1RJqVaPiCf?= =?us-ascii?Q?uZpQxOZ89TUR/YoAVppmhfhW+3YgXVfH/GRt1u2cDpXW0bQ3q5A9bIPTIrVu?= =?us-ascii?Q?gWx7ZJvWuqlsOYEZghrFDxa9AnGOzd/O6i96X+KCxC/XIEuKaxQNYSTd+q1G?= =?us-ascii?Q?Edx7OXMP/0JFvpHWrkF1QpfjossaJ8I/Z5g7jW5W7CsKz/lftrwOqWleIPhY?= =?us-ascii?Q?XpaLEOdDlFu7GifTOkgaSXhiGuds/vqldnL+cyUYxjz4OVToKjStt24MHEVF?= =?us-ascii?Q?XItxB734qj/GZoTkk1kUaQt6NIwrC0DEdmH8XO4/QIvNUNwCj5DkjZxnK8n7?= =?us-ascii?Q?3ph0K0IisfjdqO8Xv/Hy1vo3fUNDcCI38fInlfAtbGO04BN4NxP9vBMHiF88?= =?us-ascii?Q?PJCfVcFiUksEiz2WRVXYQgD44kPoQHz/vybONqqBkGDBNDDSG+vObaB4IfL6?= =?us-ascii?Q?GDb2nBZi+t9n/uLZQNVFbjlpIDBxKuYrR1KFA3pLRZzuLo1m4D74WaSek4U/?= =?us-ascii?Q?D15F0pFZ2N5ykIRF0p1qqF7CrNR+HD7cgONCCWyJ4dNIgn05FXvfWPhtXiLG?= =?us-ascii?Q?VQKbjRIrdmsF7OqgMIxhjnoH/fr30t+KsSvFqLVgz/kTqupJ+K/fU0a2qncC?= =?us-ascii?Q?4FqRFENTmtpC/iZoNNlJb68vlPoA99UO+d9UFANQ?= 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: d6c6ed7b-071b-4237-3c0b-08dc42ff526e X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Mar 2024 01:45:54.6692 (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: bHIMAwEjF42vi0InxU9XqFB8S45W/ybZZbPT7TSyaXlWUbnaYyTNO5JE56yN+kCmZQBBL82DhuAxRlZqt/pe1w== 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:23 -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: 75alOLjt5LhJ7mJKFgG3BCZkx7686176AA= 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=i9au8GSx; 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: Chen Gang C BR Gang -----Original Message----- From: Lin, Du =20 Sent: Tuesday, March 12, 2024 5:20 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 TpmMeasureAndLogDat= aWithFlags() REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4700 TpmMeasureAndLogDataWithFlags() computes the measure the code and log it in= to PCR 0. TpmMeasureAndLogData() computes the hash for the configuration. T= he same "Status" variable is used to store the return values for both of th= e functions. There is no error handling if TpmMeasureAndLogDataWithFlags() returns an error Status. Fix the issue by adding error handling for TpmMeasureAndLogDataWithFlags(). 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 --- .../Library/BaseFspMeasurementLib/FspMeasurementLib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasureme= ntLib.c b/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementL= ib.c index 2c017a4250..228277649b 100644 --- a/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLib.c +++ b/IntelFsp2WrapperPkg/Library/BaseFspMeasurementLib/FspMeasurementLi +++ b.c @@ -197,6 +197,10 @@ MeasureFspFirmwareBlobWithCfg ( (UINTN)sizeof (DigestList), EDKII_TCG_PRE_HASH_LOG_ONLY ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "TpmMeasureAndLogDataWithFlags failed - %r\n", St= atus)); + return Status; + } =20 Status =3D TpmMeasureAndLogData ( 1, -- 2.26.2.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 (#116700): https://edk2.groups.io/g/devel/message/116700 Mute This Topic: https://groups.io/mt/104886875/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-