From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (NAM02-SN1-obe.outbound.protection.outlook.com [40.92.5.105]) by mx.groups.io with SMTP id smtpd.web12.13588.1596740788079770001 for ; Thu, 06 Aug 2020 12:06:28 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=g+o0zU+M; spf=pass (domain: outlook.com, ip: 40.92.5.105, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XUjjQbjRrksSnT+XtZJhoA3BNIWwWtcUWa2QnG+Std/ySKJLORMhXQA0N6AUWK+fjShWmnAizBIjXbXGnY4fFafEv3vhuNHpEM3yXa7H+Mvja3cj4G5YwpOj3QLBLRAY/WzLGaenAZm66GRW80vLY0W5psNvYie8Qem4LUTaPv3LBinqLeGjA8LDdEDZXtvRjozgy8t6dmwch7vli+S4tI4Y0ZS9u5H53GbQCtwIlyfEYTkf+KA3VOXBbKMnDQcqFLlOGjTOSrEZJXFQrXsbutv8rL0TpU5s2IBm5wJAY17fzPdgi9ovws8ODRpLPW9aLEf9V+7/qorxaKDEafmtFw== 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=j00j/RL7AV15Ud4JV/kjFNfrgBQgO6W38N6eHp2y6to=; b=ia5Ev14210gXq6UMld1ZnBjkZVHyTcntvPlq4q39EvxJ6gojg2ufucSFzeTb6grMd9+YvZSkrJb7vRR1Nn8z8DHe8fbqKKU/3y0kHMrYP/yT8mFsVULkRMfTpbHQ6KUzi5jwy7ddC0ZiU/EgaFapkN36amvHB4XVhdjxkvQddVWjqK4MvOlA+WwTz0bEBsnEJVne3B+XEA0mPpMF8q0/7GKRNuTfg5RByshXdWX4MjTnJQeOtU+lOnrSPk3d1b966SGRAz4tq4BaXi9ufHLEJoWl4V67CM45SfRemSuEjem1IiE0RW+8Yklfsti0nL4zb6I0iT4nszuFqySM07AbZA== 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=j00j/RL7AV15Ud4JV/kjFNfrgBQgO6W38N6eHp2y6to=; b=g+o0zU+MyljfJlqwZtC2aGk4KjbALTnrhSbKRhveoWGhsRispNgX8Y+EuM12kmHfFVN9Dlj2vPJV5H+TK/r2RbYt9vXCn97ScPpQjF4n2hj3f7Rb5vpL9khGOBZR4EdnSf+BvWVDBx0DrECjnD1ozzSndTGxy34mq3F6XgXSWyvK34Pp8kb1fZnsGNsaEMJ/UzQyTkRxF8GNpZILKfjFH4Npd/s3r63b2ZkdXy3k5OIWqBXLeOfrdz2OuiQOXgXU+rjS5q9ZY4hG1VD1u2zT4Pgt8DKXUiyQACW9yef8RiQD6wQ2f5BzXv6F/rJ0ws7M2uqCOUIaOBcv43cq+87ywg== Received: from BL2NAM02FT035.eop-nam02.prod.protection.outlook.com (10.152.76.53) by BL2NAM02HT118.eop-nam02.prod.protection.outlook.com (10.152.76.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Thu, 6 Aug 2020 19:06:26 +0000 Received: from MWHPR07MB3440.namprd07.prod.outlook.com (2a01:111:e400:7e46::41) by BL2NAM02FT035.mail.protection.outlook.com (2a01:111:e400:7e46::413) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19 via Frontend Transport; Thu, 6 Aug 2020 19:06:26 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:776D6151D20C62B621BDCBA80E39D05488F686662C35FBBBE486CCFC5B99E898;UpperCasedChecksum:5B65BDB2A42BCB37304136289A6A087CF88522FD833EF3054D6A31DD68938982;SizeAsReceived:7796;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.3261.019; Thu, 6 Aug 2020 19:06:26 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io CC: Liming Gao , Michael D Kinney , Guomin Jiang , Wei6 Xu Subject: [PATCH v3 5/7] FmpDevicePkg/FmpDxe: Better warn of potential ImageTypeId misconfig Date: Thu, 6 Aug 2020 12:05:40 -0700 Message-ID: X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200806190542.959-1-michael.kubacki@outlook.com> References: <20200806190542.959-1-michael.kubacki@outlook.com> X-ClientProxiedBy: MW2PR16CA0055.namprd16.prod.outlook.com (2603:10b6:907:1::32) To MWHPR07MB3440.namprd07.prod.outlook.com (2603:10b6:301:69::28) Return-Path: michael.kubacki@outlook.com X-Microsoft-Original-Message-ID: <20200806190542.959-6-michael.kubacki@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2001:4898:80e8:9:a161:5170:12c:6904) by MW2PR16CA0055.namprd16.prod.outlook.com (2603:10b6:907:1::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.18 via Frontend Transport; Thu, 6 Aug 2020 19:06:26 +0000 X-Mailer: git-send-email 2.27.0.windows.1 X-Microsoft-Original-Message-ID: <20200806190542.959-6-michael.kubacki@outlook.com> X-TMN: [M+zcY2yJrgEOfjIAhYpH+MRxN4IDpsur//uVCzICb5/x+PBnM4ACU/se6ETCs+nr] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 281b5ec9-eed5-428c-448b-08d83a3bd14a X-MS-TrafficTypeDiagnostic: BL2NAM02HT118: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BCA6hhe5vOyxtZjdQJhFDue08ieOLfm6iO8WuWmvakLBXnSMD9lHlVaM3j1LnDkLMKqTEPwR7s0PlxB8EDRrzsVPbBEecs5uJPoJNLRW9X8SstZxaXeLYY40l24lSk4uGQy1LRYPgiyhZeU8BW0SXFl1IKBRSi3vJmVowqyVb6Rl8idf4LGb6siI+jhlW7oLcG/Ob3Hl1xu4jc5WjV3MSA== 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: eCdafIvIfBFR6bmflIMGNfRoWrznNeNQ5I7iwvngLjMAl/ptrtsQ2oehojaWq2QabNOgeYlL1LcFW0mLULhJORJ6/xK0u1nIpqjck/d1AXaiqhgNSYZ8XTDO08ZDy9wnksjozS1qQHObBH9DCXAbbtmoPNSe/zHqiNrndcr6zbQoNPzJ441DDcoKelS6tshE5MQ0qLDqFS8ef8CC7/GPvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 281b5ec9-eed5-428c-448b-08d83a3bd14a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2020 19:06:26.4830 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BL2NAM02FT035.eop-nam02.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: BL2NAM02HT118 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 Cc: Guomin Jiang Cc: Wei6 Xu Signed-off-by: Michael Kubacki Reviewed-by: Michael D Kinney Reviewed-by: Guomin Jiang Reviewed-by: Wei6 Xu --- 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