From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.92.23.62]) by mx.groups.io with SMTP id smtpd.web10.10710.1596165348678733655 for ; Thu, 30 Jul 2020 20:15:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=o7ukrZb0; spf=pass (domain: outlook.com, ip: 40.92.23.62, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WR4JYHe8IX0OhUtGx+qk4lMZaSEjh5aIFx3CSVbzwE0o6Qe++sJwMkY3v/0PcgPCsNaPJgIGRJz/KSzFK+Dvn8Fu++p6/C+QlDE6NImNsm3bTZ7XGU5qylzC6T7WFxlkBza0AZYomLC9b9ciVT/Qv9Gexj3C5KhPQ8eTCCQk2Gcy1n9z5PGcJfWHrB7kBIhjVxC2GOi5e/Qiw957o477SwhcsxQzXmoZPImeqjps16Ow7eRGgbibgFPU99UhXAdUn48XB1Y+ryWzq79hT7FtWe+yTAEtmUJCk9OV98jP9P4Nm35x/xoA3PYXxcJ5eV8fwsSLIX5saba8tGlfTtmxMw== 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=OcK6BgDmlq6kILtNTS9BSWTVKg4f1Uk4IuthdlefOwY=; b=UJE6fuikQIp4FJdClf5mDmYAMUSpU8YFRd4t9EnUX379PsrkJoKXqniwe3yPB4YAp4CQ5z6ILfUQDL2ptV/CZrHrfnc0u1DGA0irPqYFkSHDKX3/RJ/HuC5NeJqMA7U60IVUlXXyekP2R+LWrMxKkn/KDnzjdtJwq3ETBubgD7zFP/BOCWSLX8d16TOkrCb4R5hkiCxc44vYPSVsKC2kyDgCyIyRzGH/7+36v021h08KtjS4e1XL6rJc9PZXSL4qfk+JWRIixCBZEFtSfW1X6X4YCrjftkBULqhAuelQc1qqkt8PVNe5nGq2AWu2VMmJmemhctnC6FCyCJU3wOiJNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OcK6BgDmlq6kILtNTS9BSWTVKg4f1Uk4IuthdlefOwY=; b=o7ukrZb0EMvkP99Zp5z82piksqXmnEJusAARMpd31d6MTCSfmwm1bTtfB2YiMDjqqmc+qnoN3EDkKJM9SScb+6X3XqXbitK6s94UUJh9nfQvajooDML+Fx6MGaM5eEuli8w298CAfkV0ZDuvaLFDBkty0YL+S/2/XfX5Yi7eQ5O55JrT4Qno4A5jIqbAtGWfUjqTUiRzEcBIbtor+aczcdysMR2HyM/bND5eNMqOiTpfsyYOA2vCUzIE26pRrRHb9xeL0e6Lt8pllu35xrjbXIQdFCCH5/VWjbnlgj4iWeIrzHRkBST+Vyh/yUmiqhmP/+VMAnfHq+KTpJc8fCAVCg== Received: from MW2NAM12FT019.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::4f) by MW2NAM12HT206.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::212) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.14; Fri, 31 Jul 2020 03:15:47 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (2a01:111:e400:fc65::4c) by MW2NAM12FT019.mail.protection.outlook.com (2a01:111:e400:fc65::86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.14 via Frontend Transport; Fri, 31 Jul 2020 03:15:47 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6BB567BD39A93823DA5ABA137304700E5294F38DFC57A6D3911D5E1515E325E0;UpperCasedChecksum:C9A32238BF557F7F7C89DF1DB7F1DADF3A7012121661AE49B112DCA2145AB939;SizeAsReceived:7733;Count:49 Received: from MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::9856:570e:1735:974e]) by MWHPR07MB3440.namprd07.prod.outlook.com ([fe80::9856:570e:1735:974e%7]) with mapi id 15.20.3216.033; Fri, 31 Jul 2020 03:15:47 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io CC: Liming Gao , Michael D Kinney Subject: [PATCH v1 5/7] FmpDevicePkg/FmpDxe: Better warn of potential ImageTypeId misconfig Date: Thu, 30 Jul 2020 20:14:46 -0700 Message-ID: X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200731031448.1103-1-michael.kubacki@outlook.com> References: <20200731031448.1103-1-michael.kubacki@outlook.com> X-ClientProxiedBy: CO2PR04CA0115.namprd04.prod.outlook.com (2603:10b6:104:7::17) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200731031448.1103-6-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:0:8072:23b8:48ea:d2c1) by CO2PR04CA0115.namprd04.prod.outlook.com (2603:10b6:104:7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.18 via Frontend Transport; Fri, 31 Jul 2020 03:15:47 +0000 X-Mailer: git-send-email 2.27.0.windows.1 X-Microsoft-Original-Message-ID: <20200731031448.1103-6-michael.kubacki@outlook.com> X-TMN: [s2XPxHXdYqjiLUIBWKHTDyQsug0c7cEI/ileDKA1rvEcp9xxMfVa0PIWPxq/SGhN] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8a4ccb02-db11-4aee-a1ae-08d8350004df X-MS-TrafficTypeDiagnostic: MW2NAM12HT206: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +ti6E2c+dQZnxudoKVEde4NTF8ugBKxEhtgos8/Qq/1ldjhPQDJAEQPZImXeA1fdt8lVPz3VPWYh20eTGe8RosPmfL1+LjXVoacjcsCApiVf+4ZlZ5vs40hc0lIbW3AnrNWu8GzlbxRZ6WjtrsuvBU9DV399hG14q9+YrKYzlne9FHDc5KqiR9enCybn1RPGvYA+EDVckrA3S8ssiugBkw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR07MB3440.namprd07.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901; X-MS-Exchange-AntiSpam-MessageData: aeCIcVFOLWns43/LcT30tE1wNLzQtWyTHAY0yKGvwDpQjtq27xfViNxU10WGTc14jx1NuXX6+if84A/w+kYcaMKWEsdhwhEmOhosXxOZi8cw64DFaHHO0CA3HIIllZ1pT4kKxnAITBbXiPaUNhKE7Vv5ndhrgqb9YdjVg8A2Nlc9WQrBPh/ULAtq/86IeKvxSMLK0TaB8pZnzhPYWrzUKg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a4ccb02-db11-4aee-a1ae-08d8350004df X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 03:15:47.2681 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: MW2NAM12FT019.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2NAM12HT206 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Michael Kubacki A user may fall through to the case they depend on the PcdFmpDeviceImageTypeIdGuid value to get the ImageTypeId GUID value. The default PCD value is 0 (NULL) so the code would further fall back on the gEfiCallerIdGuid value. This change modifies the print error level for the message that indicates this occurred to DEBUG_WARN from DEBUG_INFO to better warn the user that this occurred. Cc: Liming Gao Cc: Michael D Kinney Signed-off-by: Michael Kubacki --- Notes: The PCD documentation indicates it is valid behavior for the user to fall back to gEfiCallerIdGuid. Is that really expected? =20 Would an ASSERT be appropriate? FmpDevicePkg/FmpDxe/FmpDxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c index 58841774fee0..14994ce4ee0e 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.c +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c @@ -3,7 +3,7 @@ image stored in a firmware device with platform and firmware device spec= ific information provided through PCDs and libraries. =20 - Copyright (c) 2016, Microsoft Corporation. All rights reserved.
+ Copyright (c) Microsoft Corporation.
Copyright (c) 2018 - 2020, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -179,7 +179,7 @@ GetImageTypeIdGuid ( if (ImageTypeIdGuidSize =3D=3D sizeof (EFI_GUID)) { FmpDeviceLibGuid =3D (EFI_GUID *)PcdGetPtr (PcdFmpDeviceImageTypeIdG= uid); } else { - DEBUG ((DEBUG_INFO, "FmpDxe(%s): Fall back to ImageTypeIdGuid of gEf= iCallerIdGuid\n", mImageIdName)); + DEBUG ((DEBUG_WARN, "FmpDxe(%s): Fall back to ImageTypeIdGuid of gEf= iCallerIdGuid\n", mImageIdName)); FmpDeviceLibGuid =3D &gEfiCallerIdGuid; } } --=20 2.27.0.windows.1