From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.43]) by mx.groups.io with SMTP id smtpd.web09.9982.1657636317783984747 for ; Tue, 12 Jul 2022 07:31:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=X7CtpZeq; spf=pass (domain: arm.com, ip: 40.107.22.43, mailfrom: sami.mujawar@arm.com) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=oWPf+D7/61jQyXig6Alr+5ZpRR+Xx/m8z5y0xz0LMFPxGkMMCKBBA9oQ3nS811A+AZ/5AziVd0EY5Lyjg52Hs+nyiFPgJNH3un02ljmW0RFY5Pn+mVzBVXCRz+dsWb0VOYOdt5NNgFKMnZEJL6N4jOAGxpEEDLrHHynE4NQOkqllEF5MsclXmu2C42zie5DG2zMczzmvSiAMHM6kyspoi+ARpskoPynnnPkao7DUFDb2EL9p/QwWMiUSfVRCIHdCZ6cp8KNNDYZXkfLXEuK2SoH1UAfLnPA/wsoKsc6O+EK+z3qTFkDnd2pojiR8amDsxS0w0gVsa4Sfhk+wfjImmQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fKbvSk7IDSwTCyw/VRVa3lu+/QjDWdTCaMoBfozwHTo=; b=FG+/NtxdUrMFS/beKpc4tZIf8MLyeLNTgu7aUfPO2jiz/GqsNq4k63GKdtGc9ZbPYB6OD2xAS2a20IFlSt2pRE2U4EA920cNrBXpyLkmBKuPQ/J7cB0GlTOayI5vwVFPZez9s0GujXtSZ0pfjLbccVn+xtefaydB+gA9oZlbNLyqzA6uMixAhLkrgBqAzAmzc3cf48TmGuk2Nj8llvciV4BSmcMjX0rDSkdp7WBSou8lNzGN6DoFIIjIUHOOhI3dgXrYrjpW2w5frHEDE2qcNQpS+isqG7B40vuJZvsLxNinO01YzHk7kvyfSXAghMw5CVfvxost2AAjNsPdpj2EuA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=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=fKbvSk7IDSwTCyw/VRVa3lu+/QjDWdTCaMoBfozwHTo=; b=X7CtpZeqzScqEpojLphrJ0zXAGg00PPsH/vQtqJjRMz83fGoh/BjcQ6b6EoA8aArOxhnjvkVbZAs/bxE19JOVbGxD03Lr9o3inldaX2EwdR46kR2hoAygcI0x359oOpkZKLk6Ae74CpDLOJy0BRVHPF8iyNi6kXCu33bIR+ZUP0= Received: from AS4P250CA0009.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5df::10) by AS8PR08MB7222.eurprd08.prod.outlook.com (2603:10a6:20b:345::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Tue, 12 Jul 2022 14:31:55 +0000 Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:5df:cafe::4d) by AS4P250CA0009.outlook.office365.com (2603:10a6:20b:5df::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Tue, 12 Jul 2022 14:31:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16 via Frontend Transport; Tue, 12 Jul 2022 14:31:55 +0000 Received: ("Tessian outbound 190453a6d737:v122"); Tue, 12 Jul 2022 14:31:55 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 7fc010ed04ae56de X-CR-MTA-TID: 64aa7808 Received: from 0be1f835cbec.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1A354F50-6CDA-41E3-B78A-5D5F4A3B24DB.1; Tue, 12 Jul 2022 14:31:48 +0000 Received: from EUR02-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 0be1f835cbec.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 12 Jul 2022 14:31:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cBETjqujSZH5iSZdlk7LcS78EbuPh/CVScKe87lAo07q105gEwIvQ7B/edXHv2lbPu8LePl4Qw148GPo2zZ6oPcYvpXTGCcsdA1K0n4FkxhOSp1X5TYalu8pCjS+5Z5INUvTZlRBo/QEn0+kdeyu67Gyk5O8EEyBvI9jlHFhN8Q7zAEn4DPOJr4lLHwa6QCUsVqZg4JcrGcsnEV35NM2PSMPv6tufL2c7udd9RvJ3ImWbOpFuqOmIeOedJhv0MBXR9ZMGAunCLGgFq7wkdbs9yhm/LwL+2z+ODWrCYEycjo8puQUzqI5HjqR6+QO97IQbWEt236Tw2S/WW08lCPlNg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fKbvSk7IDSwTCyw/VRVa3lu+/QjDWdTCaMoBfozwHTo=; b=JEFfh5sSoiJzfRqM8SB1Z/oQFxRiT1nUjKNYKIqU/ocTVrBXr3oNjSVJHPB9jrfoZfxjjze98nrJ24xLAWufiXugE+d8Tz0e9sk/Bs2Ge2wyRG9OJ/4HscXH8azEnVUhDjI5yCdZCCrBmoxC4MxNHrdRYVyK+4uen5rMKGvrRNyK7/fNmuM9+ah1QdPlcp3sY6WMfq/arbH3oIyRb+By4jylFArDjk1PCkOc0D5W+iSB/Ez6OzFyt+lbWKwjczfu1BFd/dH9rmHRsGh9ock7hxqoWx8l5h/u3LcJywtm2VigB8pLS7xuZv59dR3WHdnZhD5rBzC8yF7352BagLByWw== 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=fKbvSk7IDSwTCyw/VRVa3lu+/QjDWdTCaMoBfozwHTo=; b=X7CtpZeqzScqEpojLphrJ0zXAGg00PPsH/vQtqJjRMz83fGoh/BjcQ6b6EoA8aArOxhnjvkVbZAs/bxE19JOVbGxD03Lr9o3inldaX2EwdR46kR2hoAygcI0x359oOpkZKLk6Ae74CpDLOJy0BRVHPF8iyNi6kXCu33bIR+ZUP0= Received: from AS9PR06CA0410.eurprd06.prod.outlook.com (2603:10a6:20b:461::28) by AS8PR08MB8247.eurprd08.prod.outlook.com (2603:10a6:20b:522::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Tue, 12 Jul 2022 14:31:45 +0000 Received: from AM5EUR03FT025.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:461:cafe::de) by AS9PR06CA0410.outlook.office365.com (2603:10a6:20b:461::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.20 via Frontend Transport; Tue, 12 Jul 2022 14:31:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT025.mail.protection.outlook.com (10.152.16.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5417.15 via Frontend Transport; Tue, 12 Jul 2022 14:31:45 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Tue, 12 Jul 2022 14:31:43 +0000 Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.9 via Frontend Transport; Tue, 12 Jul 2022 14:31:43 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH v5 2/8] DynamicTablesPkg: Handle error when IdMappingToken is NULL Date: Tue, 12 Jul 2022 15:31:35 +0100 Message-ID: <20220712143141.18516-3-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20220712143141.18516-1-sami.mujawar@arm.com> References: <20220712143141.18516-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: e36a81a6-474f-4ed3-88ed-08da6413450a X-MS-TrafficTypeDiagnostic: AS8PR08MB8247:EE_|AM5EUR03FT010:EE_|AS8PR08MB7222:EE_ x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 6YQ+1+S+3Id1WeCOgxFtWDy72jPJZBP7UcyX8zykJ8WLgLD8IlGA/Sbfv3Dza9ZD97CZ5l8TLN704GTAQl36mDMDb/VDW9vhPoZrimyNQG07ku2U+Ico18BSZzLG198o5N3e+T1MO0oVanxvSHCW923qWHs4OXZVevsLycgDHmTMZ+pIuVl+ZDjpdtJq14HHUJCHQ9fjU4CBDA6gQ35XQ7Fb19r/CuYDT5o6074Hs1fUrJ0qAgel6qv604uHcZQ7YSAa/YBxu9HMhQxM3LUqlHqTBEtWEbl29Ah1VSXmSUjUzgRdsu4mmf3fiOhO17kysVcg/5LiUM4+hg4i65h3Gkn1PBjzYeNM7KO6xpegxsH4vQghInREtujkuugLLA2vx1RO2pbOeTlXJp+qyzQLEOHl97OYZrfE0H6yzPYzVvYVjH06Is+aDxB45L4sFlpV04UD1NOZWm//Mfn/TNIxf0PXELZqS0TDDJUdQfRT3ZDzhz7erf1P6RsQC0z2mtdq/hdODRTToRu+WbNGoiaKHyXb4dwKp5Nl0up5XIpyzzKwUK3Z7tJJRb277GJnsAWs07B1VhNrsk9XWpPW34a9pLkCfHvtsBc1WOxV295qApoXkzbPbg2d9osr5FuSxxM50h4GHIPUaULbMQgfIGMrUJiMmAmi+frwrFXH8VkETjV4kLrgfnqll60ScBHf3tTrOn5NiQuvydVcHR1qDI/b9oldK/79cUwr20iS1/k8XNxccEwvkiyWwCCinQU787ielcnTfOL4lAZTZe+f7g3DK4Ou8IzNmclEb/sZaqB96oGX1cGr6RQ88NVeTnWFe5Stv5E3KzZl5jTpoKOsZmH1Mt8z5yM37MgVwHGuSQcMvptnJqqSuyQ4sG1blGLX1FmLq8f/2pzdEFCJjIUXH4n3rxve0NJdTj6/xC8C+69FBas= 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:(13230016)(6029001)(4636009)(346002)(396003)(136003)(376002)(39860400002)(46966006)(36840700001)(40470700004)(81166007)(2616005)(36860700001)(40460700003)(83380400001)(70206006)(70586007)(426003)(1076003)(82740400003)(8676002)(356005)(8936002)(44832011)(5660300002)(86362001)(47076005)(336012)(4326008)(186003)(36756003)(2906002)(40480700001)(26005)(41300700001)(6666004)(82310400005)(7696005)(966005)(316002)(6916009)(54906003)(478600001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB8247 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 2e51d703-f6fa-4f57-ffd7-08da64133f73 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SJenN/TrvWNcWj68SFlq/SR8aYwD4+pf7P9WxwuqQdFLWJVl2WJxsxNpVe76/7rRu1pPBofjdYAwn7fkn7WgmZhU8fF2U8SCN2bAXq8ai7Aax9Zu7GIiT6iHgUkjUAxLNzTHgfUgqLPybbni6soeXWZ2Egp6shyW84MhHGWKQsMbegGN9Ct+1TYxXN4iR7Tt0NWefqS8zIXPACJmhPXRlS0VdEXGCl5j+nFWv9e9SLLHD9FZ9wbGLE1sLxrvU3K5SXCuZhh0Jsm6qQ1L0QEUlYuLkokeqUbsWDjMeA2L4/EMAMUfudn8JQeyj5m88N9j26SISynEbgIObqBJayQGv10ZjY3i9o7Tq+qOC8b2i+VaTpmtTCziX1X+I16RSlFzoNrR96jXHDBoFPA19xUGTm5yMGKuEsGD3ZDltd8xRWkI3DOPvH6n+7OyYPFCh3GicDygzUkNDcU26vouaDZ/rJvCMR9uzErTl3CyF8ducTrikYUKlrBnhb4eoHxsOjnYNY0tzH6gCuOVosC+lZvXQmTNs/XNGCizsyMG7zYNFY5oe1dXnNiRksqxc4/KHt8GVwIbi2UcVQjg8TUqCx/G3ps8vqM7bv5dWBmUpyzj5FNnwm/QGBbBuLmYI+gCBwHmWUPh6b+BIUddIecdv2/fH7oxuSYokIOFAu+9GdUFZO00v2w6gIL0WE77Z3c7ymyx+UYxuwzG/JLg6sgMrW/ysMhld1/5YNsF48O2MzyopLwKZzNQd/fyu7zi7/9wZh8MBCaxf3GFVOn7TUWG9RzWDVhgFT9qSfqnjrZ8mhtMeR+MWFLdFri2ltpURSGIeWp0blKmCDE5ukhJxIVSWXn/s2al90V/ko3k5LD4QEcxfkPiW6t0inZoQRNS4EilJwwN7Nm239uABvHbt14bJCBmow== 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:(13230016)(6029001)(4636009)(136003)(39860400002)(346002)(396003)(376002)(46966006)(36840700001)(40470700004)(47076005)(6666004)(966005)(2906002)(26005)(36860700001)(40480700001)(478600001)(426003)(36756003)(83380400001)(82310400005)(40460700003)(44832011)(336012)(8676002)(86362001)(70206006)(186003)(1076003)(6916009)(54906003)(81166007)(8936002)(70586007)(4326008)(41300700001)(5660300002)(82740400003)(2616005)(7696005)(316002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2022 14:31:55.1196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e36a81a6-474f-4ed3-88ed-08da6413450a 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: AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7222 Content-Type: text/plain Add error handling when the IdMappingCount is not zero and the IdMappingToken is NULL. Signed-off-by: Sami Mujawar --- Notes: v5: - No changes since v3. Resending with v5 series. [SAMI] v4: - No changes since v3. Resending with v4 series. [SAMI] v3: - New patch in this series. Moves error handling code for [SAMI] IdMappingToken from patch v2 6/8 and v2 8/8 into this patch. Ref: https://edk2.groups.io/g/devel/topic/83600728#76662 https://edk2.groups.io/g/devel/topic/83600726#76661 DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 82 ++++++++++++++++---- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index 0f13c32b838bf4fe42b53a1e9c3ce817d74681fb..daf9ff00c3deab4005814bbfcf1650469d1e7d92 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -1,7 +1,7 @@ /** @file IORT Table Generator - Copyright (c) 2017 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2022, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): @@ -905,9 +905,19 @@ AddNamedComponentNodes ( return Status; } - if ((NodeList->IdMappingCount > 0) && - (NodeList->IdMappingToken != CM_NULL_TOKEN)) - { + if (NodeList->IdMappingCount > 0) { + if (NodeList->IdMappingToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Id Mapping token," + " Token = 0x%x, Status =%r\n", + NodeList->IdMappingToken, + Status + )); + return Status; + } + // Ids for Named Component IdMapArray = (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *)((UINT8 *)NcNode + NcNode->Node.IdReference); @@ -1011,9 +1021,19 @@ AddRootComplexNodes ( RcNode->Reserved1[1] = EFI_ACPI_RESERVED_BYTE; RcNode->Reserved1[2] = EFI_ACPI_RESERVED_BYTE; - if ((NodeList->IdMappingCount > 0) && - (NodeList->IdMappingToken != CM_NULL_TOKEN)) - { + if (NodeList->IdMappingCount > 0) { + if (NodeList->IdMappingToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Id Mapping token," + " Token = 0x%x, Status =%r\n", + NodeList->IdMappingToken, + Status + )); + return Status; + } + // Ids for Root Complex IdMapArray = (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *)((UINT8 *)RcNode + RcNode->Node.IdReference); @@ -1242,9 +1262,19 @@ AddSmmuV1V2Nodes ( } } - if ((NodeList->IdMappingCount > 0) && - (NodeList->IdMappingToken != CM_NULL_TOKEN)) - { + if (NodeList->IdMappingCount > 0) { + if (NodeList->IdMappingToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Id Mapping token," + " Token = 0x%x, Status =%r\n", + NodeList->IdMappingToken, + Status + )); + return Status; + } + // Ids for SMMU v1/v2 Node IdMapArray = (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *)((UINT8 *)SmmuNode + SmmuNode->Node.IdReference); @@ -1361,9 +1391,19 @@ AddSmmuV3Nodes ( SmmuV3Node->DeviceIdMappingIndex = NodeList->DeviceIdMappingIndex; } - if ((NodeList->IdMappingCount > 0) && - (NodeList->IdMappingToken != CM_NULL_TOKEN)) - { + if (NodeList->IdMappingCount > 0) { + if (NodeList->IdMappingToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Id Mapping token," + " Token = 0x%x, Status =%r\n", + NodeList->IdMappingToken, + Status + )); + return Status; + } + // Ids for SMMUv3 node IdMapArray = (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *)((UINT8 *)SmmuV3Node + SmmuV3Node->Node.IdReference); @@ -1476,9 +1516,19 @@ AddPmcgNodes ( return Status; } - if ((NodeList->IdMappingCount > 0) && - (NodeList->IdMappingToken != CM_NULL_TOKEN)) - { + if (NodeList->IdMappingCount > 0) { + if (NodeList->IdMappingToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Id Mapping token," + " Token = 0x%x, Status =%r\n", + NodeList->IdMappingToken, + Status + )); + return Status; + } + // Ids for PMCG node IdMapArray = (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *)((UINT8 *)PmcgNode + PmcgNode->Node.IdReference); -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'