From nobody Wed May 15 11:06:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92107+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1659604867201567.1786023014334; Thu, 4 Aug 2022 02:21:07 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uUBkYY1788612xo6vCjQ0j0v; Thu, 04 Aug 2022 02:21:06 -0700 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.49]) by mx.groups.io with SMTP id smtpd.web12.2744.1659604865252485413 for ; Thu, 04 Aug 2022 02:21:06 -0700 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=ocjp/EIcTX5kHAPZSeFulEtk3FzEvy6nx6LCDY5CSqHGHOSGDwt0CdMjg6fXgX5FJBgvUKqucdtITBNVq2tVeXPPufKMp5lmcOCYIg16ZY03ApB5bMVeu6KzpxXhz3956wVVDQNP6NVhsioBnuEPLwZ39jfATRwjbR63ciHI2jonMHmbUw7aXuqVt1WA/nwijQYk9vVkdGCNHX0tmYTozj0wYz07THwWSFEDzaJ4dWAgD/m6+wov0NyOnBQP4+I7oicMGtpAjRYkWUG5quKT0bYpkhe1vNwfuE/cO8EqIbRv3CLpKUGcjono2n8dr1vrJugYBcWgK9HJtzlU1jF3nA== 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=149jdJuYJHiVu2Ol+l82j3TLX0i87MarOJ7+FQ57N4k=; b=QU6Mmwp81UN/0Gz6Nul+G0dFxvfTcKw3QQudU8EvVcAk1nkJtmYOFy2fCgj+5GW4mSW/xSokJMOpJgmKCIdNr6UUsTIPYf8OZByxQL6mqtNeOnn/yNYFncK50YXzbPZWZSWqElcuJx+EEz0BKhqGe5R5ByjUvcVIXUfHehNFIhUjbxJNlwqIqD1lLxql87dK1XqdAoguuegt4p0oisgqQhCCufTPIy4zsK54rzsdmEsvZeYmOLnzCMdehRWDWkM9ZNoJ6UmD/HUGaDSRfBU1qsWajcCmswdoikAhk1saWN2shj5NuSYpRpbDQXrAY08yEMJN2KppbL25awCfLTqyFw== 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]) X-Received: from AS8PR05CA0018.eurprd05.prod.outlook.com (2603:10a6:20b:311::23) by VE1PR08MB5792.eurprd08.prod.outlook.com (2603:10a6:800:1a6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 09:21:01 +0000 X-Received: from AM5EUR03FT032.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:311:cafe::de) by AS8PR05CA0018.outlook.office365.com (2603:10a6:20b:311::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14 via Frontend Transport; Thu, 4 Aug 2022 09:21:01 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+92107+1787277+3901457@groups.io; helo=mail02.groups.io; 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 X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT032.mail.protection.outlook.com (10.152.16.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12 via Frontend Transport; Thu, 4 Aug 2022 09:21:01 +0000 X-Received: ("Tessian outbound 2af316122c7a:v123"); Thu, 04 Aug 2022 09:21:01 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e2d8e25494179e94 X-CR-MTA-TID: 64aa7808 X-Received: from 9b92b4606960.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A3D56B3D-A9E9-4422-A237-FD0B505EDB37.1; Thu, 04 Aug 2022 09:20:55 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9b92b4606960.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 04 Aug 2022 09:20:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uj+wQXmMPBwYRoRCtkvQNTEvT7he7BqQJe0csM76lEOxbV9FiNYUJqb+Z/+JDwuP25y2/tR8oozEJLOFGt0u1tDFJlvheZhzaSUaJAudMTnGJZP5haT/szCVFioSitZbCmKcx4sOQW6YeUOud3v0ha1STwcxf5FHhukHptXp0RY7YWLtw1jOK4Lnqlt/uoa/IG+C70hFGw2SYrVzO6vju/KhzbKN0xnAWLI/Mfw/75+RFQswm8tYhvNyP/U3KN7tpUPmrlLLj5UQvaml4SkOOkJZW3ujieC7zWtLUgZ8w6d4IvHDzO0N/F0mjxPIyyDaQICfM1IJ9pRuRw/DM/9ALA== 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=149jdJuYJHiVu2Ol+l82j3TLX0i87MarOJ7+FQ57N4k=; b=CeteXkMDzHH2RC7+lPcHk1YZ5goa9KnVZvPWzVdzihKp6DIWuP9VpC1itlUqKLmev3LtZivuO1hNgSpvGbg41dxvtEqeJ5H5V+f2oC3FRHDn0ercCzMxprOga/M3GaLZKMxos0ap1ETfyhZqpnQsrdwVPRA0P7BVIEj7dhgtnV4brFn9sHlAuSwacpab8yrJIoj3pticYNImYqIcwmXO6S19afiKN4e+UaIoHTgulfVFCXCVaDXBvj+v5dgfeuSLyeZP5hATwVFb0mJ6oRG/9jWgigFYYtOCZEQHKY/R0cFoTpEaLikw2CmBGKmb93bWD9sk0n+DVHslzPn06R3k8w== 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 X-Received: from AM5PR0502CA0022.eurprd05.prod.outlook.com (2603:10a6:203:91::32) by DB4PR08MB8126.eurprd08.prod.outlook.com (2603:10a6:10:383::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 09:20:52 +0000 X-Received: from VE1EUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:91:cafe::d3) by AM5PR0502CA0022.outlook.office365.com (2603:10a6:203:91::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16 via Frontend Transport; Thu, 4 Aug 2022 09:20:51 +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 X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT009.mail.protection.outlook.com (10.152.18.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5504.14 via Frontend Transport; Thu, 4 Aug 2022 09:20:51 +0000 X-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; Thu, 4 Aug 2022 09:20:50 +0000 X-Received: from e125545.cambridge.arm.com (10.1.33.142) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.9 via Frontend Transport; Thu, 4 Aug 2022 09:20:50 +0000 From: "Edward Pickup" To: CC: , , Subject: [edk2-devel] [PATCH v1] DynamicTablesPkg: Fix using RmrNodeCount unitlitialised Date: Thu, 4 Aug 2022 10:20:50 +0100 Message-ID: <20220804092050.1004518-1-edward.pickup@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 8fca9eb4-9b8a-4686-cf3f-08da75faa609 X-MS-TrafficTypeDiagnostic: DB4PR08MB8126:EE_|AM5EUR03FT032:EE_|VE1PR08MB5792: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: qXIajyl4CiCYQYugQgWmb/RgT1xnlSE+HzD6ZKu1vG0aBJ9pte3w4n9MK7nfh0sOq/JsBuPWofT0S6kmZajjVnyXGkWTTeL9gdsytnejsgZAsyioZEDFcCP1AEjgDSIg3K3a7XC1lMtlKrzT4l5Nv+6r6n+PIPag44Od41myHcAjWKmzJKn2YdpcA6wqQqLrVtvYQ26PT9y+uyG7GRmLH/wZ6JdUfMmEFfUv1abW2/MMon+7KbRWa4Kw5EOqB8V3M0I0NzrFz4fsBrsBQFcVI6B9bgTT+S7Bn3R18OuJkOFgDnuyYSZtYoeTvpip1dUnlAD/hsMlyEuOdxwkPRo2X4cWMMK0mekWKlkQ3G3aqJlU2V8Bw4gxeWfej2fRxhSXdsJbDJEOxnq5kLzoOlJ2Ig4451otoRTy/NM7JDkn+d7bnERTIznb6VDVgvOvPwfJ/h4QOcHgs381y1kElPw6aziRFE4I2dDu0CB7p0He84xQOyXcBkkOfVNQFkoo126aGsFmCK0c8P71MIWyTAlLPSVg/t5kfURCrn6d9ukt6WBx1ppQ42RGmcOJMTQQY8K9EPfYsRWZ04lTLoNrGsP2PKHmc2CXlqx3ZV3YghUfzRJDHBNyFYVdKuhDjVKdyqlGqEMOzZSdFoSENHa9qegOKa2FhqKatRT08fwdthoEmGQ2wKmmFkMU/Y5Xrirb744dNCuje8VMzXyIslYp9MsS0dKC0iF/8kninrJkz+cfdyv/VVhdDasdbaQbm8Sw+6n2S8j19vLV+N3fQYQRkLAqf8UIO1M0euzo+STNncByeI2cYVmsYCJZIH1Ld/dUt32lqMzjeFSv6zLidz4AtAMztr+QVAIe+cyglw00lRXcxY7MEvoiw1V1xs3VYjpI3qMV 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)(4636009)(136003)(39860400002)(346002)(396003)(376002)(36840700001)(46966006)(40470700004)(1076003)(82310400005)(7696005)(44832011)(186003)(47076005)(82740400003)(336012)(2906002)(41300700001)(426003)(40480700001)(83380400001)(36860700001)(2616005)(26005)(36756003)(86362001)(70586007)(70206006)(8676002)(4326008)(40460700003)(6916009)(316002)(54906003)(8936002)(478600001)(356005)(81166007)(5660300002)(966005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR08MB8126 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT032.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 236f932b-4eab-455e-9db1-08da75faa03d X-Microsoft-Antispam-Message-Info: zsiiiPqxqN+9SDZbAnYrc8v2EfUUsyPjFvFhuaLqedKX4s+Ked2JK6neTH5vanzZr0H1RZqgjAooEZaEfMyBUXLSTlPIbbAIVHNigygvFymXk/sUV6etepuBXRQb9Xg7h9H9PkrMll7JNAcBd4wDI4VHi9r2CjDP4+kxoG/VpjBvPujuCkehl1Nhi9nNnQFpT0QQTWIyGj7gTTwgQj5KyeZbbJCtYP2vLRzdK42fI9LKzV6E4CbTnrsWqdvPEfYCAMIZqklriUVi2Rpcgy5HDs5pX148PD6mfpyXCFTXbBWeDH0EVnZvGHkwJ6ebox51WXjWPk74r4D4TLJIMp7xmnFb0mUJEbqlSANtYY0Uu5Irjp9xKZNVaZdqTeqjFLAts4SSvCQY+kCB8GSaQwRAHYdvtP3/sFGdbnfUMqMzxFsK2vYAKVPX6/EX21Xly8Gwv4UPQ3xK0Rzw23euG0a38vMcIHh3Put8RpHJXfkR9fTxHwA1wbFGFH7OGS6led9DCDYqamthPWUWRAY5IyCU9uOXNSjTKWUOSp8FbyNzCEeYQi3g32kfdIKieYPs4ZqkWcWuptGZBgb1F0aWnDkFeG3cRjsAMD686iQP+QQDbwnCzHPksCCuXWeUtynrNuo84uRsyXLWCkXGT6tW2qmmXQNIHTlk36pYQpr0pBheubeh1ZIL/hKspV9MokQaZTR2h2Gi9agQS8X3txi4oq7PzeBNNPO/HzhVLoF+KWh5rkHbqgeU9akR/7JQqFzG2xOazm/pys1HtPD3ut1Glff4ZkL1wLIYWl8fbXFCb2/h7JkegJjQ+imfGflxHZA1C/M4FAWPDEiROQCKfeGODVzW6g== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 09:21:01.3812 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8fca9eb4-9b8a-4686-cf3f-08da75faa609 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: AM5EUR03FT032.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5792 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,edward.pickup@arm.com X-Gm-Message-State: J696Asytd8NvwndLCY8fR4jJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1659604866; bh=WRfJRlUaGnniPB17y/DFAqxs5GK7DVUuWlHtqiSLUZw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=gmGjqsv9gP7Hq1dNc3BuJmN8IqFe83CWzJqbImZVV2//bPDZWb84NltC1tcY+dY9a0l vIplgyFupBhNqrr/uWri/aHELG90yTKKdBNv93ewI8PFedSNkj8g09qI8BX9fhFgTW3gO Zzs7pduXb8bxmy7dVGMsM15Xk8uuP2QAD2U= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1659604868587100002 Content-Type: text/plain; charset="utf-8" Fix using RmrNodeCount uninitliased by initliasing it to zero. Also, add an additional check for ACPI version. This fixes a crash running on kvmtool. Signed-off-by: Edward Pickup Reviewed-by: Sami Mujawar --- Change can be seen at https://github.com/edpickup/edk2/tree/2322_rmrnodecou= nt_uninitialised_v1 DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 7 +++++= +- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index 40d99162cc610de2d0c2f0a5fff6e457c08d07fb..f28973c1a8620aa5b756e85af1b= 46ebfaf018839 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -2107,6 +2107,8 @@ BuildIortTable ( ASSERT (AcpiTableInfo->TableGeneratorId =3D=3D This->GeneratorID); ASSERT (AcpiTableInfo->AcpiTableSignature =3D=3D This->AcpiTableSignatur= e); =20 + RmrNodeCount =3D 0; + if ((AcpiTableInfo->AcpiTableRevision < This->MinAcpiTableRevision) || (AcpiTableInfo->AcpiTableRevision > This->AcpiTableRevision)) { @@ -2714,7 +2716,10 @@ BuildIortTable ( } } =20 - if (RmrNodeCount > 0) { + if ((AcpiTableInfo->AcpiTableRevision >=3D + EFI_ACPI_IO_REMAPPING_TABLE_REVISION_05) && + (RmrNodeCount > 0)) + { Status =3D AddRmrNodes ( This, CfgMgrProtocol, --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92107): https://edk2.groups.io/g/devel/message/92107 Mute This Topic: https://groups.io/mt/92809989/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-