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.103]) by mx.groups.io with SMTP id smtpd.web11.10889.1596165343386777984 for ; Thu, 30 Jul 2020 20:15:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=O5wuIXEY; spf=pass (domain: outlook.com, ip: 40.92.23.103, mailfrom: michael.kubacki@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mCJiv0PaNfWop7LXMhDuYIABNxSsg7olxlezi0wFEJhAcUfqErA311YRl+1b03hYVxRojahL/g0BRrZyJ9tM2bgWBN+pbAwm+bchdAv/3ivz+AFeFZbg8MCmQtUVjlA0mPP7uWC4pCOzeK9r33K2e/XzHipx0nxLuCkkDNkrGzUVuXpxd64zPJBVVCswJLVEtMtjHsyFnG92uggencn1g2GMZZy7SZTYa/1JrATtJV7BI8vw3CK13SAN3ST2EudJjrq5BB0NSKZ/etGV9kikirrZgILvpgNllTYkYmYcg94IYAihVdz/KdbAiRL5sI3SEotMQ3HbN4f2DAt3+hfkjw== 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=mETWPJDse5G8GY4D33JJHOnIWfkOljse5SAPznVh7xQ=; b=W8PCzSQ2F4oetRaJznnSpPn4jGnJLrzlFRaFUs4g8qPSTM6EQaYCCzgPv7RI2gPgvej+qB45tMaKfXI1QSLAuPh7Hr/MNX8rx/+VSzCUKikqQWAbxEPp9A8E9/0pknRajJvg9Lcm2uB2nYT0w3oDyBqUDqa5is4gtp/48VNKtPWjJ6fh/PtLJP5EsA1PA86R29G6PsgHgWt9YXEAJP+nK9/ePK6iZLGcZS9HnvbIbmbU2MzA9JINk9wF4oWnMiBiH08PztFtnQj/sKLnAkOeU2UZB1m1XIjC4pY//LZxgszB4fxSrttX+N3SxZCpY2aUvaAnHbrZu6aR0M9Zag2thg== 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=mETWPJDse5G8GY4D33JJHOnIWfkOljse5SAPznVh7xQ=; b=O5wuIXEY3trdm6ZoVq1G4fYUD8tfS6jnc8uOjwGlfmxgISr+8eVi0B9fzyefbMHWyasbe3VgGqVtCQF27ShYCdxXdCYc7pWxCMxo27+MNOlMZ+7b1TT205TxrliSGVlyJm2uJmikqRFNBtVU8Stvn6gMMQjM4qh76r6x2bydrRzu+FKvm3SM6VbANv4tgiUe2pGefZ2z3GlDlJvy89kBlFeoiBTXZWjns7cu4leqJRCfwmo8Zri65iw12A8pbVDuv+g0s7ZvqGOspPHbqJdIZHj+9PgMOlr716+Kc2hkz6PQY6YgxL1ddLzCOIdFXzQyN8n3Cc1CQaE05PKE47cENQ== Received: from MW2NAM12FT019.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::41) by MW2NAM12HT111.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc65::145) 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:42 +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:42 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:74FA537136A591B66024FB7777AEAA5890FF53DFDB52E0805904976A135F56BA;UpperCasedChecksum:45A4CDEEF9A6687909BA0D46E4C55C1E42450F168DFDCA2A5CB6275B078ECB29;SizeAsReceived:7728;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:42 +0000 From: "Michael Kubacki" To: devel@edk2.groups.io CC: Liming Gao , Michael D Kinney Subject: [PATCH v1 4/7] FmpDevicePkg/FmpDependencyCheckLib: Return unsatisfied on handle failure Date: Thu, 30 Jul 2020 20:14:45 -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-5-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:42 +0000 X-Mailer: git-send-email 2.27.0.windows.1 X-Microsoft-Original-Message-ID: <20200731031448.1103-5-michael.kubacki@outlook.com> X-TMN: [oL24equtq98/EYCHFQK9MCfioKdFKotDeyzfCGwW7Y8EGMi5SjVsWEAfy9j7YUc6] X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 49 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ebcb1e1d-7a71-4177-5bb8-08d835000211 X-MS-TrafficTypeDiagnostic: MW2NAM12HT111: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3qpQVSqBw5pFKdRrxxfSxeCTeKzHxSGZnBwqco+9nf+5W0g92kbQVPGK50SxfLnEBI80/eQEaH9/BXaTr6xWqiXgmtlc7cz+KCPkw1pRST8On1p55ZXizgGm+aPGnZHrGQ1/476ZuGlSD5H6Lsokt85wjPbb+tezDVdBfCy/H+cEIBoE1/hIifQ2xsWnA+MRVcpVGH4IPuRP+VS3sG3j0Q== 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: 3tOae5a5Oym2eFzS5C8gso58I8kOYf+rzY5Ze/02xEyc++pXXy4ZEN1xsnSoIMrltkTrBGYPRhweVXTRCHiZbC8C3tHolW4Xbvh++nSZ3NQ03MxC8CPEnhWXSJ3CpxBCgH6fRfQIPBJ2qf4G7ycJYqME05+OcFhUL8QxNjMkSYSefQvU/jbjSXJyGYqvKPD1v84X/o7kYIeUsD6hSmJekQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebcb1e1d-7a71-4177-5bb8-08d835000211 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2020 03:15:42.5528 (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: MW2NAM12HT111 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Michael Kubacki CheckFmpDependency () will currently return that dependencies are satisfied if the initial call in the function to locate handles that have gEfiFirmwareManagementProtocolGuid installed fails. This change updates the error handling to return FALSE (dependencies are not satisfied) if this handle search fails. Cc: Liming Gao Cc: Michael D Kinney Signed-off-by: Michael Kubacki --- FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckL= ib.c b/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c index 5e0241b25957..02ed600e0e95 100644 --- a/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c +++ b/FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c @@ -2,6 +2,7 @@ Provides FMP capsule dependency check services when updating the firmwar= e image of a FMP device. =20 + Copyright (c) Microsoft Corporation.
Copyright (c) 2020, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -75,6 +76,7 @@ CheckFmpDependency ( ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "CheckFmpDependency: Get Firmware Management Prot= ocol failed. (%r)", Status)); + IsSatisfied =3D FALSE; goto cleanup; } =20 --=20 2.27.0.windows.1