From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.42]) by mx.groups.io with SMTP id smtpd.web08.10431.1636541803704171270 for ; Wed, 10 Nov 2021 02:56:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=E6IBytwy; spf=pass (domain: arm.com, ip: 40.107.8.42, 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=DXOpsZpaWViuEqi+cxTqQC/yKrF9dTX8+4QgHccCgnA=; b=E6IBytwyMRghSvpWNOQcg7YWqWFyxbhAiaIvngL7s5pdw76oY9G1wshCQ1gV7BbEO0FFm3nMfNlMGZeqrq3C4TrHeKHqZ30m6EV2wDUdmI4XQScMXxhh42HtQkDW4e63SZ7gUHYRnC0Xo4xIRoSHN5xHk/9MOwh51M7sCqpgiW0= Received: from AS8PR04CA0149.eurprd04.prod.outlook.com (2603:10a6:20b:127::34) by HE1PR0801MB1756.eurprd08.prod.outlook.com (2603:10a6:3:7e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 10:56:37 +0000 Received: from AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:127:cafe::9d) by AS8PR04CA0149.outlook.office365.com (2603:10a6:20b:127::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16 via Frontend Transport; Wed, 10 Nov 2021 10:56:37 +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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT019.mail.protection.outlook.com (10.152.16.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Wed, 10 Nov 2021 10:56:37 +0000 Received: ("Tessian outbound 7b0bcc4a550a:v108"); Wed, 10 Nov 2021 10:56:37 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a0e88d25082c7491 X-CR-MTA-TID: 64aa7808 Received: from 64040ff652d5.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1A925617-4136-4092-AB5C-3399665C9460.1; Wed, 10 Nov 2021 10:56:31 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 64040ff652d5.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 10 Nov 2021 10:56:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B3xWkMgXq3gwCTYazHGPlfQz5YJYDQN8c9kWWrXDI60ZtxKsp5TvtlJJJzvmGCpex0Usi7MHG/hG4bhzilhvj2vgKF4uLWEQCtrZ9anp76p6abpyKPm7E3ITbhmuX6xxbShRQGQCNPk7nenduaS3HL8kI46jgLXPSyW4NQNNDcGp8oVdm7BD0scOVxI+rgCxS8/RbcKz7y4xJtDWRehpEDdO07LwbG4tqQpMKy/2Mol5d1Nuwo5fZwbT4by+jaCPSePnBx9admP6xfgZqlsEIcbBMgTAzdeULEdCufKLhlrLVpU/Dw7MG+9ud1UjV+XW2hLaE65XrwFKZfkwBmiIgg== 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=DXOpsZpaWViuEqi+cxTqQC/yKrF9dTX8+4QgHccCgnA=; b=HjiegUB6G71UXh9/ApZ2gHlANbv7myFWenpdpOb6wQ23gcDfpjdsdRBKLvRYrefGxnZyUgKc20uHnX4/xsK0Db9hnpGOcJA2c0YB0vri7VMuIc5ptRUFyJjKodeHJHuxgCO04vXvENES2amS9UyPOw+oKRnsnTS/+VfnNRtF17WqNB0Idm6ncu7Ln1UI/qVgaTfbUCO/udJNch5oZ8UAaEr3MTq1NFad5dOYXRiClBEmvgUoEA/ZJB/m8SiYrU5Beb0IqC3zH6o0fal2sWGeOAslCXcmNE3G6STrqDgZ9iMrwjSFTwSfgt84/IybvQ2rnkWUmRUkpePBSrOO9h0U1g== 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=DXOpsZpaWViuEqi+cxTqQC/yKrF9dTX8+4QgHccCgnA=; b=E6IBytwyMRghSvpWNOQcg7YWqWFyxbhAiaIvngL7s5pdw76oY9G1wshCQ1gV7BbEO0FFm3nMfNlMGZeqrq3C4TrHeKHqZ30m6EV2wDUdmI4XQScMXxhh42HtQkDW4e63SZ7gUHYRnC0Xo4xIRoSHN5xHk/9MOwh51M7sCqpgiW0= Received: from DB7PR05CA0042.eurprd05.prod.outlook.com (2603:10a6:10:2e::19) by PAXPR08MB7351.eurprd08.prod.outlook.com (2603:10a6:102:229::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Wed, 10 Nov 2021 10:56:29 +0000 Received: from DB5EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2e:cafe::c3) by DB7PR05CA0042.outlook.office365.com (2603:10a6:10:2e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 10:56:29 +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; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT038.mail.protection.outlook.com (10.152.21.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4649.14 via Frontend Transport; Wed, 10 Nov 2021 10:56:29 +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.2308.14; Wed, 10 Nov 2021 10:55:29 +0000 Received: from E114225.Arm.com (10.1.196.43) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Wed, 10 Nov 2021 10:55:29 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH v3 4/8] DynamicTablesPkg: Handle error when IdMappingToken is NULL Date: Wed, 10 Nov 2021 10:55:28 +0000 Message-ID: <20211110105532.38696-5-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20211110105532.38696-1-sami.mujawar@arm.com> References: <20211110105532.38696-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d2f7342-4213-4bdb-18de-08d9a438c4b5 X-MS-TrafficTypeDiagnostic: PAXPR08MB7351:|HE1PR0801MB1756: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:5236;OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: TBvuxqFwGsM2XXkjkJqwLGu8StEtPBbDyHu9fiwFk3Y+RMEV5b3K3R4pIuSVy4FojyYawrfv4nbdFZgwuOsprG5O763wQvxTTDEZ+8AO46WreVbIRAiiUYVk31cvY71Ki0IKhiBNOZmgSH9hgkhB5GBotpUezrmhimHBUMvnfor2buRsDoHeiXsXMVDp8R4af3wf3oJE3uKsppovQIa7N1tWnVoAI9XRV9jWu0TNIXldUzWlaVgj6hzSU+4U8TfToB8+/dFtRCy9jr+f5fBlRO0YLkgZhT1jb6hQ9coWbkXvJPsoIDTy1cJVMpni2WB6qQjaQiq3laIJUlHGyCVie7aomhyG7DayMACE/qqmF4BoPHJ6E1Ac7hj0YjPKY98MUyenpNHFKLNfziqxrKbCJc6UoIgTQRZyoVpqGuwak4AnnoF0J10ksTc+5c3caXG/EHET7OzcA3WB96RHh4EpTrv2US3uoc3EHc3p9V4yWfUkAPJ5cn300iPhePPn6mMrMeRb2b6k/D6QETbk+t/C5PQHMJ2Z8gNMl7BxGciqBgbW9iCs1/Dxq5kOnb4qoyW0DFyZ2dAnHgYYZtnsEFalIEwp2pG5AA2YQ1a0lxtFwjkp0YhBb/jey2fy8dUH30iRhVUVWvPzcyHaVyxuCAGO+fc57S04ez/4FDH+Gb2gMCm/otQYVbP69pDvd0BX5e1VOTS6eA8Un1AMtVK/NVwGJqAIEirquVyasX099lewXjcWH1z+hXxPHpetGVWZBdOfXaav9H80YmsxIcmBGDB0xJB6WjXGSg3LluSW3qs1KFPa8L8mKZLxpwZQ8AraOEiaEezVHAWDuhfKcY1dehB4tnkllScg4jJ7ftVqSAWI+v4= 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)(36840700001)(46966006)(336012)(82310400003)(36756003)(316002)(186003)(47076005)(83380400001)(6916009)(1076003)(2616005)(86362001)(508600001)(426003)(7696005)(70586007)(356005)(36860700001)(70206006)(44832011)(4326008)(8936002)(81166007)(5660300002)(8676002)(54906003)(2906002)(966005)(26005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7351 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 7beeb4b4-fd47-4816-a160-08d9a438c021 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pBSmKINg0QBsYqltBdDVIp5BummYYwYhQpj06Irp4ZsdP5jYcDeNds4lbXfUvcJNliq8AM4zN4fp/NPmMx/jxB2WWXSGccQPKReVRwTtemWk+81KrvpqxWQravAgXeTEpJA1SbDnl1kfToxvRk4MD5OiToQ0K/eGEZMs0Wvqt9ogR2oLWIIHKO2adLMYlxyYEeU1vtyFzsF/cjQ+ljSaoQjo2KHv9UX6Z6Es/7joUtssRRHevohdNDlH/WhT4tmIokzv0YHV8Ov9Wfevl+hfGQua4LbW10iOQEGABj+5+sfiJ66cW7gxUWZA8Qb3eLQHz7klYFM+Qs59+eSyqx5ONjNqNWV8UpOS7iO6VezgiXn3k3gIn+UD/BPOP2N093UNICIfRzodO0OUYSujCiCU7mBb66UGXTxJx1oWlimhIGXA0IVsKk1Fm6rawMIdnHyd9mhh6FLAgYH2wZVPJ+rP0CpUBmTAIXRM5YRoxz1HZbbMqqTeo/3A45IIJ1vBA7Sh/tCMLeIEQ+yzlv+x87Zq8i6I0uKh8ZgJ/pp2j5LDspB4zSdgdG//pisFV4prhYVxuQXGEO+6T8n99UGrlnCkYD/5AAz2lt9DZnG33dbjXtNMnfY6kyK+c5dwYN7ROAaLWgiXRMhmUUZcBG1bFTpBa5SjT2oV+QlvUyJPTJ8xbLZYBlz/ZMSoFLMwid89YN5bpxzVaOiCGbG1lFpa1zaUXl3jZP284dflnC/zwFgFqj+QhsJahB8crp7kO+9RXfpX4LD3csyt+c6wNYLm/dYIkR0OqGMdoWWLoZJ/1EJix19uNLcusgQ/5yBXCLCVwxaL 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)(46966006)(36840700001)(81166007)(36860700001)(336012)(2906002)(82310400003)(8676002)(7696005)(86362001)(2616005)(47076005)(8936002)(44832011)(26005)(4326008)(6916009)(186003)(508600001)(70586007)(1076003)(966005)(316002)(70206006)(54906003)(5660300002)(83380400001)(36756003)(426003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 10:56:37.4372 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0d2f7342-4213-4bdb-18de-08d9a438c4b5 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: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1756 Content-Type: text/plain Add error handling when the IdMappingCount is not zero and the IdMappingToken is NULL. Signed-off-by: Sami Mujawar --- Notes: 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 | 75 +++++++++++++++++--- 1 file changed, 65 insertions(+), 10 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index 349caa8006bc34ca789cb3e321a0f87c0cd4ff0d..a1714dbedd3e34e2716e828092aac169461c43c9 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -899,8 +899,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); @@ -1004,8 +1015,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); @@ -1233,8 +1255,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); @@ -1349,8 +1382,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); @@ -1463,8 +1507,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)'