From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.59]) by mx.groups.io with SMTP id smtpd.web09.13159.1609766557042466245 for ; Mon, 04 Jan 2021 05:22:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=dWLy8LHS; spf=pass (domain: arm.com, ip: 40.107.4.59, mailfrom: sami.mujawar@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bLIUyM8jHVDyFK3RZbdOtI3QNMsdJPWMW0gl6V72I9E=; b=dWLy8LHSqL0nYXTu4QUWdtj9uYKxRq3/KKujZ6ZsJuQEHct6VOXXHLON8OWR/t9dk2xgmB+vWDFMNbNMVeCZ2Kv9TP7/W6MhITQbQMiTLF7ikp8bl1tYV74CroidcBmzCEQHboxFzHtzxdjzE9NFyDC63sh1bLlPohrgNgyUi0I= Received: from AS8PR04CA0067.eurprd04.prod.outlook.com (2603:10a6:20b:313::12) by VE1PR08MB4959.eurprd08.prod.outlook.com (2603:10a6:803:110::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.22; Mon, 4 Jan 2021 13:22:34 +0000 Received: from VE1EUR03FT021.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:313:cafe::24) by AS8PR04CA0067.outlook.office365.com (2603:10a6:20b:313::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.20 via Frontend Transport; Mon, 4 Jan 2021 13:22:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT021.mail.protection.outlook.com (10.152.18.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.21 via Frontend Transport; Mon, 4 Jan 2021 13:22:33 +0000 Received: ("Tessian outbound 39646a0fd094:v71"); Mon, 04 Jan 2021 13:22:33 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b19ac1f1345df209 X-CR-MTA-TID: 64aa7808 Received: from d43277a48892.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BE5509BE-CA67-4B02-B556-7D7D09B63BE0.1; Mon, 04 Jan 2021 13:22:27 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d43277a48892.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 04 Jan 2021 13:22:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jp1+CX+QWHtLbCV12vzLTIAcUkvRyyLsfrM6NbF+3aY8XoMGH8VPGakQ5gVstGLlnoMoaUH50Fzr3VgGW0BZNbbmQp8vaSNYhCy1YdW9d/xg2Fty1jpoJlYApPGN+kyW0VbUwK3jps91uqLE3G7SsrHKNXupe8DJUR3T/Mb/mylbMDlOfQmAV1iRnCkcBRolj3+EYcjOPQVftXvfU8f1zQlc9pr/Cjvwrr640Y1xfl3oVTFAkWU+nklLDt401XhY/EzFwmEqDE2HVwFct6K0wQf7P6M7CAeblaQhKriKS+0GltORZrO3eaMK8wze9TxHhSQrF3+0Eb4qk9GP4TqelA== 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=bLIUyM8jHVDyFK3RZbdOtI3QNMsdJPWMW0gl6V72I9E=; b=DYAzwQou5kMrtgdJAfnnYa/nuR9dMrLcxuDUdz9he/Z/9IzCj4WzDctxuLk3b7eUef9OQXLhe4VaUSZhvyqa/OnO0RzUNzS2J+LN398GucGNBHLJSryFs3n8boOd1N2TzoGpSyvCKSejndD3EA/+3gkhl72W7/tICierdIRS/H5wVGAygneSonlen56KIL5B8/0tN1pcJ6i/OaC45wp7BYcI+WT2eoEWx9wkDxiKU1Du4h4od0/7qYoXSoHXIwZ+NxrAYBL6YqVV7I24my+J8zmrhL3v7Ay9f/4hZ7y0oTXEWnd/QF02DbanaD7nPGCfexKyF98yLHgsLTANOnhG9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bLIUyM8jHVDyFK3RZbdOtI3QNMsdJPWMW0gl6V72I9E=; b=dWLy8LHSqL0nYXTu4QUWdtj9uYKxRq3/KKujZ6ZsJuQEHct6VOXXHLON8OWR/t9dk2xgmB+vWDFMNbNMVeCZ2Kv9TP7/W6MhITQbQMiTLF7ikp8bl1tYV74CroidcBmzCEQHboxFzHtzxdjzE9NFyDC63sh1bLlPohrgNgyUi0I= Received: from DB6P193CA0008.EURP193.PROD.OUTLOOK.COM (2603:10a6:6:29::18) by AM6PR08MB3464.eurprd08.prod.outlook.com (2603:10a6:20b:43::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.23; Mon, 4 Jan 2021 13:22:26 +0000 Received: from DB5EUR03FT011.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:29:cafe::ee) by DB6P193CA0008.outlook.office365.com (2603:10a6:6:29::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3721.19 via Frontend Transport; Mon, 4 Jan 2021 13:22:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT011.mail.protection.outlook.com (10.152.20.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3721.21 via Frontend Transport; Mon, 4 Jan 2021 13:22:25 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Mon, 4 Jan 2021 13:22:19 +0000 Received: from E107187.Arm.com (10.57.38.43) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Mon, 4 Jan 2021 13:22:19 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , Subject: [PATCH v3 06/26] StandaloneMmPkg: Fix ECC error 3002 in StandaloneMmCpu Date: Mon, 4 Jan 2021 13:21:53 +0000 Message-ID: <20210104132213.22376-7-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20210104132213.22376-1-sami.mujawar@arm.com> References: <20210104132213.22376-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4dfcb47b-661e-47dd-e858-08d8b0b3cbca X-MS-TrafficTypeDiagnostic: AM6PR08MB3464:|VE1PR08MB4959: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8273;OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: dTX/1EKm4i1qqk+7HwSepC6ZVwWg8subfpeSGc2+HTzqTBrd2byk8xRS5c/Tn2wWyRJOSSpP6SXa+t8DvFZpgaHlMZjnQ2QDqRAJNIr3odaUcWLbFQJaU0zDzbrWWzc9KB/W+8kE5WrCZ73MiztuAkv+WFI4rfOgEu6+X1XYEtVF3JDexyIBMRMC+SCP0hq9oc8k14ILHiBbgfBQ3OJO7B3VtoT6miUXuAEXQjZKjMyxV4POW02fNIBL/zDfSW7MMTjLLdsfZ4EqI1CK9HrvCS9XbcPo/nekT831KO0+sTO6QIKAaX7f95OF0nBd/04aAB2pCrzGTdMddiBqPLczyvO1B0c2oEL0mrIqxFbEeaxrEWKAvwV6S8IO4Nyskv8WdzBJ14VwxN2XJ/wq7cxOfyf1LCA0zyTVTxatvL1jq4/bZqBWEsah6Bp9CmmuKBdCA8J1uj9wf5S9VqG/Idcg8Sq7zZXSATgLlfYmJHluc5odlL7V0t6W0jyZjTxIwDFwOsb21ylGaSF8dHUbknszZdCTd+dSkE4xktogmlRcd6A= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(6029001)(4636009)(136003)(39860400002)(346002)(396003)(376002)(46966006)(1076003)(26005)(4326008)(82740400003)(336012)(82310400003)(83380400001)(8936002)(54906003)(86362001)(2906002)(36756003)(5660300002)(47076005)(478600001)(6916009)(7696005)(6666004)(316002)(70586007)(70206006)(186003)(8676002)(2616005)(356005)(426003)(44832011)(81166007);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3464 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: d6011bfa-be91-491a-c410-08d8b0b3c71f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MppO0j/E/JxaUPI6rQNjO6NO7KgSIu4L7eHilg0JjnVVIdlBDvWZbJhFRxjC1mb2ahdjg3X+bpI8QlsuV+TcOZbBBKOFprXkcnaNTAnwereTHDG/bhlm5WDagfzsixrdMVHXpt0mUFiirU43R9OdwcnyN0tNjFbTbBKjAlOaCJkwdBSeamJMOs2mb5sSjp/5rt/UmU/msheaXYJhGngA3ksRd2+ynSyp+X1jq0mZWtM2PFET7ENzNmYFawAVicnqwba45iuXTs0RBStE6/4D38I8Jbb99+5PWMCgANgg+9f4hDIloM7Dod0MyeyrUszjI5t2/1rpNsV0Oxfv9yHmvuLsSzwujb+iO9rQA00tFFwee9E5s2G7pdPCqBl5DDRME2Qwmg50brc3h2bbHlfwr36rUdCVqI8MGyOhGLrG44zetfSBqJmM7Gp/L9whltEIbl9BHDLob7XHW8INfKbOqNC5R0xMC2LafNY8vVeZ/IVrwFdTOoFeCLDhn1DhHXxECdctC//iEDU0Ys515CoUW8eR3rJhPW903M2ANX4qHvw= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(6029001)(4636009)(346002)(136003)(376002)(39860400002)(396003)(46966006)(54906003)(478600001)(316002)(4326008)(6916009)(83380400001)(8676002)(82310400003)(2906002)(81166007)(1076003)(70586007)(5660300002)(82740400003)(70206006)(86362001)(8936002)(2616005)(26005)(7696005)(426003)(6666004)(44832011)(186003)(47076005)(336012)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2021 13:22:33.6323 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4dfcb47b-661e-47dd-e858-08d8b0b3cbca X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4959 Content-Type: text/plain Bugzilla: 3150 (https://bugzilla.tianocore.org/show_bug.cgi?id=3150) Fix the ECC tool reported error "[3002] Non-Boolean comparisons should use a compare operator". Also fix the following: - add curly braces for 'if' condition statements to comply with the coding standard. - The value returned by GET_GUID_HOB_DATA() is stored in *HobData. Therefore, check *HobData against NULL. The original code was checking HobData which is incorrect. Signed-off-by: Sami Mujawar Acked-by: Jiewen Yao --- Notes: v3: - No code change. Added bugzilla ID and resending patch [SAMI] with v3 series. v2: - No code change. Resending patch with v2 series. [SAMI] StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c | 19 +++++++++++++------ StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c | 11 +++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c index 6a25c4c54843ccdc2d745e8e537942d49b1d1141..9738e8bd60149efb45ef1b66139e0cec38b6c1fe 100644 --- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/EventHandle.c @@ -1,7 +1,7 @@ /** @file Copyright (c) 2016 HP Development Company, L.P. - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -84,12 +84,18 @@ PiMmStandaloneArmTfCpuDriverEntry ( } // Perform parameter validation of NsCommBufferAddr - if (NsCommBufferAddr && (NsCommBufferAddr < mNsCommBuffer.PhysicalStart)) + if (NsCommBufferAddr == (UINTN)NULL) { + return EFI_INVALID_PARAMETER; + } + + if (NsCommBufferAddr < mNsCommBuffer.PhysicalStart) { return EFI_ACCESS_DENIED; + } if ((NsCommBufferAddr + sizeof (EFI_MM_COMMUNICATE_HEADER)) >= - (mNsCommBuffer.PhysicalStart + mNsCommBuffer.PhysicalSize)) + (mNsCommBuffer.PhysicalStart + mNsCommBuffer.PhysicalSize)) { return EFI_INVALID_PARAMETER; + } // Find out the size of the buffer passed NsCommBufferSize = ((EFI_MM_COMMUNICATE_HEADER *) NsCommBufferAddr)->MessageLength + @@ -97,9 +103,9 @@ PiMmStandaloneArmTfCpuDriverEntry ( // perform bounds check. if (NsCommBufferAddr + NsCommBufferSize >= - mNsCommBuffer.PhysicalStart + mNsCommBuffer.PhysicalSize) + mNsCommBuffer.PhysicalStart + mNsCommBuffer.PhysicalSize) { return EFI_ACCESS_DENIED; - + } // Now that the secure world can see the normal world buffer, allocate // memory to copy the communication buffer to the secure world. @@ -192,8 +198,9 @@ PiMmCpuTpFwRootMmiHandler ( ASSERT (CommBufferSize == NULL); CpuNumber = mMmst->CurrentlyExecutingCpu; - if (!PerCpuGuidedEventContext[CpuNumber]) + if (PerCpuGuidedEventContext[CpuNumber] == NULL) { return EFI_NOT_FOUND; + } DEBUG ((DEBUG_INFO, "CommBuffer - 0x%x, CommBufferSize - 0x%x\n", PerCpuGuidedEventContext[CpuNumber], diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c index 617babd5ab4bcb200ee10e19ec6f99c2ef163200..7c004c8013460bb7f1690351aa64eeaa9eab91dc 100644 --- a/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c +++ b/StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.c @@ -2,7 +2,7 @@ Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
Copyright (c) 2016 HP Development Company, L.P. - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2020, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -53,16 +53,19 @@ GetGuidedHobData ( { EFI_HOB_GUID_TYPE *Hob; - if (!HobList || !HobGuid || !HobData) + if ((HobList == NULL) || (HobGuid == NULL) || (HobData == NULL)) { return EFI_INVALID_PARAMETER; + } Hob = GetNextGuidHob (HobGuid, HobList); - if (!Hob) + if (Hob == NULL) { return EFI_NOT_FOUND; + } *HobData = GET_GUID_HOB_DATA (Hob); - if (!HobData) + if (*HobData == NULL) { return EFI_NOT_FOUND; + } return EFI_SUCCESS; } -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'