From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53405+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518867293894.0906527732828; Mon, 20 Jan 2020 03:14:27 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id te8NYY1788612x7WvUYfqoVl; Mon, 20 Jan 2020 03:14:26 -0800 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.44]) by mx.groups.io with SMTP id smtpd.web10.9233.1579518865455931697 for ; Mon, 20 Jan 2020 03:14:26 -0800 X-Received: from AM6PR08CA0006.eurprd08.prod.outlook.com (2603:10a6:20b:b2::18) by DB6PR0801MB1734.eurprd08.prod.outlook.com (2603:10a6:4:31::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.24; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: from VE1EUR03FT047.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::209) by AM6PR08CA0006.outlook.office365.com (2603:10a6:20b:b2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53405+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT047.mail.protection.outlook.com (10.152.19.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: ("Tessian outbound ca1df68f3668:v40"); Mon, 20 Jan 2020 11:14:21 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: cc3d1380dd3a2616 X-CR-MTA-TID: 64aa7808 X-Received: from b92fff37ac4f.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 93597E6D-ACBA-44FD-867D-1F581625DA16.1; Mon, 20 Jan 2020 11:14:16 +0000 X-Received: from EUR03-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b92fff37ac4f.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QAs4N1KVMcAxMDet/QWBXHZTQG9XAXk849GGBhDn/08+XRQw640QBLxgguqXyHWWmSDQKq2+/UACuCFbYThk1g0+fNNiJ6kXzPOFJN+GYFs8hSCagMFt4bL+jfTe0J0R7+eskAGsrPZzAPW75A1UJHYpKUbGlkXRb9J5fP9AhkyjE+erM9SGdugXMxFWuirvIBWIOsGfiwvFoHM7qT+mAFWMY0WN66x+105tnh2hHA1yDyLbUBomm29ZQ5t3Zr2eUIOSp3HPUfH9KfhpaEVD1DxG6r8+x3qMsCePmaH4MhGG4pjbtXbUqWiwv0vLPKMQVsSkXA2WQAyK4Uk6o+Y7KQ== 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=j/Q4b+8TcROta+SaG98GQCMbjzfxqMEwL+LSQVfg5Fg=; b=aUd9iAhpsj1H+FtfWPzmXL0lzxT5LxVGSIJqHLXKrjCF1u7p98XRCVz1yvcZd2wXPrUOeFeWygV3ZMmTbStmKUTY+yF2+L53nEei2GQPo2RaNvxPi8Hr5IINsbfFN2pRJmP1qwUQDeAXZHFOoaR4b7Is36KIWPOh1WtJhI+wRUK8hni2KArfaoWOEweER4JKlefNB/0tRII46OjmDBw+VOx2I5XqJ1jJGMzsrIW71jLv/ALi8Wlam53HSE7Xe92Gi89cqHUgI93Vjv0v5X64bAamkdHg0EsVDyuI3W5yBssSVa6p0ci4yIX+vW8m9850v0/q+Eapa4V28alaz/DbTg== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from AM6PR08CA0006.eurprd08.prod.outlook.com (2603:10a6:20b:b2::18) by AM5PR0801MB1729.eurprd08.prod.outlook.com (2603:10a6:203:3b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.25; Mon, 20 Jan 2020 11:14:15 +0000 X-Received: from AM5EUR03FT042.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::202) by AM6PR08CA0006.outlook.office365.com (2603:10a6:20b:b2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:15 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT042.mail.protection.outlook.com (10.152.17.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:15 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.1415.2; Mon, 20 Jan 2020 11:14:04 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:03 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 01/11] ShellPkg: acpiview: Set ItemPtr to NULL for unprocessed table fields Date: Mon, 20 Jan 2020 11:13:41 +0000 Message-ID: <20200120111351.29184-2-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(136003)(376002)(346002)(39860400002)(396003)(199004)(189003)(70206006)(70586007)(4326008)(336012)(356004)(6666004)(86362001)(478600001)(44832011)(26005)(36756003)(2906002)(54906003)(5660300002)(1076003)(316002)(8676002)(81166006)(81156014)(186003)(7696005)(8936002)(2616005)(6916009)(426003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM5PR0801MB1729;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93e94995-52cf-4f74-c1e2-08d79d99e6aa X-MS-TrafficTypeDiagnostic: AM5PR0801MB1729:|DB6PR0801MB1734: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Y9S+3UMprA9JXdw8lz9pY7qCUedxjOxjCVWhViThX3xNup86DC941oVNDp1BK8N62ff5CBAGe0LOM0Y9OOtjkCIyX6EiqhomjNACFfViAyhqLOFms0pGUIlzjnA1YTu4iZUAwwVACByx0+/Sd0vft+seukMZx6ceNlk3AikUt6e9PrjmPL7gTL4BGrsHi8cLxnoiaRZgqlbmLe8ovNlW83y+rGs5YuKtO9AgsGmXz1Yf4t674sgnivf8NEZXSnda0Flup6EYfOsVqeiwzBvJktLDwzBcvT0Lq9zfPkDXh8kEIy15I1XoZqm7pOafRCGvrKohWgiBSD6Mr0ZyqW2BR0T28v929vB/jRqHOW3EgD4DRMXVq4JxA6y7TUfDabM+bef7tM4vVlLHshlq87fMHDckbemPFPFsSAjBIGxq+lpiBFopZuZumUPPJ3rRAphc X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1729 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: fcfd9dd3-b491-43b1-514a-08d79d99e26b X-Microsoft-Antispam-Message-Info: veSyzP0Ij2AO2JrKMg5FhUQTGHBgTkSGO0gcI2Ec6fdIUK++L+3jdMfUjE7xbsKtvuc63rbCMIpwrmKNa6Bu7N+VZHEthFCC/NC6dlhb4DMZPYUtFVEf1/ixeX1wHUf94o30R5bhPmib11zAPcLZ4nXG/TcU13WrykOtdm/8mIL9La4e60PfS5hS8S/tJBx5ssFamSkYbxKFXursRkPFahcRluqUCxkb8dKnnwFYKXupnNIjLusKHsfOJtY/VfTGox8lUe+kwa8rfki6/rr+sb6TLZAJbLoUFYNGMgOG39Dvug7b9ZMA4qWKZLifiCj++quFEK3cmloW/lu2kc250qrLqqvSYNJi/H5F3nmMrR4I02dTem3XeCzFT0sIdydgk09jNRwzrM+k0iW3kQzeIOCLXFznVyusQ5QxTKdhT0vhaYp9SsrxVAFP23ybwTi6 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:22.0671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93e94995-52cf-4f74-c1e2-08d79d99e6aa 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1734 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: owtZPLTudsghkbqkmbPatzrnx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518866; bh=CyYiymHK3YPmJsbs5wg83Tyi0dpjsYpV6iLhQpXqfho=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=VAn40tSE2BKuLAROXgEKfMhtC8Q4KUaG8pLh+0AJ+oGSFg8WSahT5PX1GNX8qPv34jh oDjAwrbFfqnIXcPX1WvOWcssSOQQing1hx19T79L4SkwnqmNEzqYEk4SggLzpWDttL397 96sLP7RZip4MS0aHSgI9Pgmjw8a9OnLBs74= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" For fields outside the buffer length provided, reset any pointers, which were supposed to be updated by a ParseAcpi() function call to NULL. This way one can easily validate if a pointer was successfully updated. The ParseAcpi() function parses the given ACPI table buffer by a number of bytes which is a minimum of the buffer length and the length described by ACPI_PARSER array. If the buffer length is shorter than the array describing how to process the ACPI structure, then it is possible that the ItemPtr inside ACPI_PARSER may not get updated or initialized. This can lead to an error if the value pointed to by ItemPtr is later used to control the parsing logic. A typical example would be a 'number of elements' field in an ACPI structure header which defines how many substructures of a given type are present in the structure body. If the 'number of elements' field is not parsed, we will have a dangling pointer which could cause a problem later. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Set ItemPtr to NULL for unprocessed table fields [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c b/Sh= ellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c index 2b2ecb93cef9ee28b752e7bf2d920b059dbf7d6b..84c5f0468da55477acc96dfd0f9= 49a5908d0f7a5 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c @@ -543,8 +543,15 @@ ParseAcpi ( =20 for (Index =3D 0; Index < ParserItems; Index++) { if ((Offset + Parser[Index].Length) > Length) { + + // For fields outside the buffer length provided, reset any pointers + // which were supposed to be updated by this function call + if (Parser[Index].ItemPtr !=3D NULL) { + *Parser[Index].ItemPtr =3D NULL; + } + // We don't parse past the end of the max length specified - break; + continue; } =20 if (GetConsistencyChecking () && -- '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 (#53405): https://edk2.groups.io/g/devel/message/53405 Mute This Topic: https://groups.io/mt/69929569/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53412+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15795188781441017.134323169635; Mon, 20 Jan 2020 03:14:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id yYZOYY1788612xEqf3em28pE; Mon, 20 Jan 2020 03:14:37 -0800 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.40]) by mx.groups.io with SMTP id smtpd.web10.9239.1579518876820553135 for ; Mon, 20 Jan 2020 03:14:37 -0800 X-Received: from VI1PR08CA0184.eurprd08.prod.outlook.com (2603:10a6:800:d2::14) by DB6PR08MB2791.eurprd08.prod.outlook.com (2603:10a6:6:17::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23; Mon, 20 Jan 2020 11:14:21 +0000 X-Received: from DB5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::208) by VI1PR08CA0184.outlook.office365.com (2603:10a6:800:d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:20 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53412+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT004.mail.protection.outlook.com (10.152.20.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:20 +0000 X-Received: ("Tessian outbound 4f3bc9719026:v40"); Mon, 20 Jan 2020 11:14:20 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 297e1c001937e0f5 X-CR-MTA-TID: 64aa7808 X-Received: from 0c3ccb0f8316.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 3EBA7CF2-4B5A-43D8-8A67-0DDF2300EB5D.1; Mon, 20 Jan 2020 11:14:15 +0000 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 0c3ccb0f8316.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tj0vWaiPLhf1vd1INmQRj6kz7iFIU99IfBO6FJnMXX5YdRjyZO7YXM9PvVwsNmwGyltmBY6dm03QYwike78vnJR+iBt1lmQdffJ+FoHJXoMx61ECIhRC9OTf6VN72H3dl/IeeTQ0F/7JQWSBGY1O8UdTfbu7L5QkWIGrvSLSiRLXDdYgUnI0KgBkG4yqnm5Y3UMs9OBR5R/Sj1eJ8WwT3KHn1Jb0NVzM160FvVVORRvoNCh0yYkFhdJmlJ4JFlCvu8m7s+tERGCmM9gU7cRJxnfpbGwr8magcaQMbMjwlqB/i2HYQZeWkny5ZoKTY2Se6ivNtajKgg9ifa2kWywwPg== 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=qqHQTBAB+4Z+UQEy0zTUs4AensblqJ6ugLj2sXlYk1g=; b=OJ0/Sh7Yg21AoxbVBjzYeSnGIOIUV5H5tJRTAdr05KUFoAZe1jmVhn7vQRlYN24qexZRWOE+L8fThWNuNc0mnqZqYFkFNAUh4QurAHmLR9QN34t6j19OP3RoLwlzzSdK18SLYQQD/ka/HgQTMtIJ9sq3NpMkqnnTNzaOXc50lyxOwtpfrLGhJkLnYXY/LZIcz5hmT9c1GCS8ojQVnQ8SGFLhfbeAxSzIma+b2uf+8gp2EcXmPGK6s3TfHhpJTzmOtfrlYvulAVgylOROLlujI5X2pSYdCT1o8/Lb0cmX8TWXlUjjS3kbb84YZrSKtqXGxGSH7z+aXvVFEfQXeZiiLw== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR0802CA0024.eurprd08.prod.outlook.com (2603:10a6:800:aa::34) by DB8PR08MB4986.eurprd08.prod.outlook.com (2603:10a6:10:e0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23; Mon, 20 Jan 2020 11:14:13 +0000 X-Received: from VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::209) by VI1PR0802CA0024.outlook.office365.com (2603:10a6:800:aa::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:13 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT059.mail.protection.outlook.com (10.152.19.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:13 +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.1415.2; Mon, 20 Jan 2020 11:14:04 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:04 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 02/11] ShellPkg: acpiview: RSDP: Validate global pointer before use Date: Mon, 20 Jan 2020 11:13:42 +0000 Message-ID: <20200120111351.29184-3-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(346002)(136003)(39860400002)(376002)(396003)(189003)(199004)(26005)(186003)(2616005)(6666004)(356004)(7696005)(426003)(336012)(44832011)(4326008)(316002)(70586007)(70206006)(8676002)(81166006)(8936002)(6916009)(81156014)(1076003)(36756003)(15650500001)(478600001)(86362001)(2906002)(54906003)(5660300002);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR08MB4986;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fcbbda4a-fd67-4d25-b1e8-08d79d99e5da X-MS-TrafficTypeDiagnostic: DB8PR08MB4986:|DB6PR08MB2791: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:6790;OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 0ZRYyQ0m7X8/C7DFCr+WgMRzLhSSdZORTi8rUR9G2RQCkQuIGl9WmG5ds1pv2KB0IYFGhO5/Yx6PcuhxA/SFQhS/xonBJMj68lfSghLsfjU87Kg5ezyXrgjcaeMfrSyXhTj4DdCVoirDcuHVfymSboubRbnAR4o/Vl5MAEaNcbgSMpKlPwjs2pSch3rdROBKuDSeomqRHHuQB8Ggu+IEPtqJXwdKzDYON1Gz/Hj/EdhYt7kCrilkDw0tOUlaRsHUBkoZjbAI/NNPRYQtE+0XFQwloIlYH/E0efsYpROQWgPSeNO8u61y03NddzgP+mohXnFpSlO113oyL6D+lu1q/DeMc5hespA3qBe7tIj0xq0FhiwfKJy2mYwlAsO+PTQOrfuC+Ga0ugrKNqpXfwhw2BQib6ISuZquI2CtRA6x1VVv5VrdLnQcnfPS2XpybLve X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB4986 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT004.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 0b9698b7-435c-4997-8a31-08d79d99e14c X-Microsoft-Antispam-Message-Info: ib5mAw1Ze5Xxa6frD7vOb5mUdMIWvuaWfLp2CoOAXxaXR0DXx+LPpsB1iP+dqAzFCF7Zudb1j6hxntTMGCdqclWVTBva05uw3a1/VVwPKBZMb2gcIIo6JmyNVXQpuZ4/gpDZ/KbWxvbkObujLGMzMPDQ5wmCqgPLGby3TYnjAbAduRdjRbMnIH0/6Qg8jq+WSGgcSoWaBlajwxVU2ZIALQucYFJYoU6sB3C7HZZKBk9x7D7ruUfT/2D6ndZ5fBDMAHECoYasIjTSEMC9grcyNLPZpqiJek0y4AnPTiBQWPpmxxDRclrePXwyQDZ15UyZ1/jnqj/T/quD70xqLlA35YjzNtj4NzRQTHEybPtKkHBHkSdwo9pgrdQ+vH8Jlyeoaz4Z8Mc24d3H9xBLeOGBIF6GqNa9l+LCx7cP79GdFXiYBPU3lYZD9zmOPeQG+KUr X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:20.7576 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fcbbda4a-fd67-4d25-b1e8-08d79d99e5da 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2791 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: okkkKECElBagIrYRdFxJrDd7x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518877; bh=9/EUupyKg100ifG5Kq0VPAHHfxhArfZlRkb1ujI21/c=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ZK9NMy7A+aA0G/EuTlCO414mTvB4x/tbu8Fm3syF4Q5cRY1/26WF6RnolMl6GHzuH/m QUEIx35qn+nN3tf62bsBX3+UeexpLl8OtNu8OYYPGhvFcHM7bpSvjGDebx5TNxYuv/Fy5 8RToBIu1ERyzXwZK51B6/9mxhGM6R4IEfRM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if XsdtAddress pointer has been successfully updated before it is used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c | 1= 2 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/Rsdp= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpPa= rser.c index 5a5c4b50c12e6eb0aa0efb1765df7e123f614da3..f4a8732a7db7c437031f2a3d2f2= 66b80eff17b4b 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c @@ -138,6 +138,18 @@ ParseAcpiRsdp ( PARSER_PARAMS (RsdpParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if (XsdtAddress =3D=3D NULL) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient table length. AcpiTableLength =3D %d." \ + L"RSDP parsing aborted.\n", + AcpiTableLength + ); + return; + } + // This code currently supports parsing of XSDT table only // and does not parse the RSDT table. Platforms provide the // RSDT to enable compatibility with ACPI 1.0 operating systems. -- '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 (#53412): https://edk2.groups.io/g/devel/message/53412 Mute This Topic: https://groups.io/mt/69929577/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53404+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518866831656.7653196178253; Mon, 20 Jan 2020 03:14:26 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id cdCkYY1788612xTNXJeCYqJY; Mon, 20 Jan 2020 03:14:26 -0800 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.80]) by mx.groups.io with SMTP id smtpd.web12.9143.1579518865162700628 for ; Mon, 20 Jan 2020 03:14:25 -0800 X-Received: from DB6PR0802CA0033.eurprd08.prod.outlook.com (2603:10a6:4:a3::19) by AM0PR08MB4403.eurprd08.prod.outlook.com (2603:10a6:208:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: from VE1EUR03FT014.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::200) by DB6PR0802CA0033.outlook.office365.com (2603:10a6:4:a3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53404+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT014.mail.protection.outlook.com (10.152.19.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:21 +0000 X-Received: ("Tessian outbound 121a58c8f9bf:v40"); Mon, 20 Jan 2020 11:14:21 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b6d1f01de9b69ad1 X-CR-MTA-TID: 64aa7808 X-Received: from a50f40eb3028.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 7A4B2899-5BFC-4EB4-BB87-6A3DD55DF901.1; Mon, 20 Jan 2020 11:14:16 +0000 X-Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a50f40eb3028.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KFI4IQiRLOFCUVty4FPC/2YSqOocVI2vfOUWJmYJeeMqHo18YWe0h+vjc5ShaOXFEAWzZ9gPyYP/jIrEZQDd1T5y4+SB/l9y2aaXvd71oBqyBJKdkAznv3+LzDi6ftATTEpAqsevBPkfI87AZ+BfAK6GqcRyoBeNYSEa7VYZAU2rgDXldH2Djqdb2Zd5d2mMaIUsRtqwKrLA36XOnaySLBkka6BBumUWg8lK5SeiBteaZENkCnAr7vKqHfDFnQ20rHLs6/BBh9AsYznSiB7BiQ5rzL0GRh54CsSd86XKgtlbdU+OdI0T7d0Y295KA6T63eGb3pJqVGpncNmFJWFlnw== 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=3u0JgC2XyF16nPB9dJYmF9LmwZ0IPoaPQWb+Y4Juk5k=; b=VMtbxxWfT03eojS384uf6LO0PwYbpoi2K6Dla4quGSSmtW0XNtcJiLebV0rzYkbLooPYG4A+aBWeSZbO93dQAavj19gSiNRbSfEZpDoME/KeSl+r7bIPtb2MvM9sVKv9VDjAZUG9Md8QL0epmv3XsjmzhSVHY1Z1TzJxIeGzggXu4wSOa/3ZWIfo46XlHyxH3fDbznTLQwVx9ESsVt+iFPHQ8OV1spk+5eoP5+564eS3gwNWh/B3HpOTsipNA8xN5hS7y9q5w9WvllZB6S3woIbsLRGjn3jf/y5r5QI/e3lE5AYzueSKg5hmftA56jrhxvfbDkcYggraxJSLGSwgEA== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0801CA0059.eurprd08.prod.outlook.com (2603:10a6:4:2b::27) by VI1PR08MB3149.eurprd08.prod.outlook.com (2603:10a6:803:41::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.22; Mon, 20 Jan 2020 11:14:14 +0000 X-Received: from VE1EUR03FT041.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::209) by DB6PR0801CA0059.outlook.office365.com (2603:10a6:4:2b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:14 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT041.mail.protection.outlook.com (10.152.19.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:14 +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.1415.2; Mon, 20 Jan 2020 11:14:05 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:05 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 03/11] ShellPkg: acpiview: FADT: Validate global pointer before use Date: Mon, 20 Jan 2020 11:13:43 +0000 Message-ID: <20200120111351.29184-4-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(396003)(39860400002)(346002)(376002)(136003)(189003)(199004)(44832011)(81156014)(2616005)(8676002)(81166006)(6666004)(54906003)(26005)(6916009)(15650500001)(356004)(86362001)(1076003)(8936002)(70586007)(70206006)(426003)(4326008)(2906002)(316002)(7696005)(36756003)(5660300002)(336012)(186003)(478600001);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB3149;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 750f90f3-3f12-4bde-5721-08d79d99e6a1 X-MS-TrafficTypeDiagnostic: VI1PR08MB3149:|AM0PR08MB4403: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: nZpCW+stuEHAbDk30h5E7K9VN9Yee2k9qF9/sCUtS0j0zpCVJOsLOF6QKZLfS0cfpcNWZYQrYh+NR0m4w7Vkcr144dQXNUsPjfuLfM32ct77zcRJnVFHKabFG6aPLDBtjo0zpXR4vDoXAkmQbBL4pvLwgY/TLSMCNyjtKcYgT5GnwJvbX7M7a0tmHpOc5jK75PkdLndNI0W8tJmcQYSxX6CszA/or7UDLDveBaQvVT4CVspST7X7tP37cmB1Q5WSnJPE0tVJn1Qay5AyOd+j6kGcWsF3K7dwfajkY2ZMHsTf/nXIVfn9LbrlBibGCgDxz75EACvTmaU97uFxaSyedPN2jIYaJMsCthX4CRhtYT2tfnSW+6yUvhdcQkg5k1s6wmRm6D/8aWERd7dHV9K73m1hzMTA8q+EFkwKVrX4grc+QygZNQPcwrrGbBaqOdlD X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3149 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 6cef91a2-f3ee-4c10-4ff7-08d79d99e1e6 X-Microsoft-Antispam-Message-Info: VPgaHmoMxoDvOCRU9UNOwrUxkeMnR2Z13vGNzSAdCr8lPoQSJt0LND2ExAvubXjli/OXo65x+cesgNmsjKrn1zfUuxecLet5SYAkjqx5HXsBjUX6XIgnFuIhcflhxwCIhWBvtxjmNB+0OvCXvcDlUICFG++E/yR6avDyeaILpoEGeuoY6tzlQZB540RYxT2XTgCJjnu8n6MzfCqmOZohez0iSxulSPS2LUX7AYe4Q2Cu9mVJfmo8iWC7Y2GxqkTEa3jeVCoH2bsVyQSn3Fx8ARssHNhU08fJI+xUsKlDFeQKqgXYlg2/gHgKVjW/fHvPKG8O0Yp5wDNX+vyDYF5yRWpTXDxaAI2gtggVSgo9X8anpMo0SR51UU7SHj3x7R9Av48KNfH0pCh7MallzGfKL1Qox6bbUjj4Tcp13no7BAu/78pOrP6H5a5udoXU/5Ak X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:21.9994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 750f90f3-3f12-4bde-5721-08d79d99e6a1 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4403 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: UJI1ip5GlKknBjRoKR4xk5Iex1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518866; bh=lW6AwzcwthCEtlSUCfEY6HMrxzaMXzKfY0ZppqCiU8w=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=u6DFvgfBTO2rGUfWSQWHOHpX729TZ2TGg+jJ4XBDejN4f36RbIdUWx8iWY9DCVXVtVQ 8VznMLZqGUTEb61/QSJEJAMI9aZE7jDK2ld4fWrQCN3BIxL6704DCyf5QKriLMaeMV+L4 OvpkXY+FiQWic3Sa8h/uU0lNCGroW9s3ZIQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if global pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v2: - Do not require FadtMinorRevision and X_DsdtAddress pointers to be valid in order to process the remaining ACPI tables [Zhichao] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c | 2= 1 ++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/Fadt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtPa= rser.c index 5b8cc174f16afb3d4feb6a518952e60c6564ee34..37cbd8be287944656afcd609a3d= d080440d5cfef 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c @@ -1,7 +1,7 @@ /** @file FADT table parser =20 - Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): @@ -230,9 +230,11 @@ ParseAcpiFadt ( ); =20 if (Trace) { - Print (L"\nSummary:\n"); - PrintFieldName (2, L"FADT Version"); - Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision); + if (FadtMinorRevision !=3D NULL) { + Print (L"\nSummary:\n"); + PrintFieldName (2, L"FADT Version"); + Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision); + } =20 if (*GetAcpiXsdtHeaderInfo ()->OemTableId !=3D *AcpiHdrInfo.OemTableId= ) { IncrementErrorCount (); @@ -294,21 +296,20 @@ ParseAcpiFadt ( ); } =20 - // If X_DSDT is not zero then use X_DSDT and ignore DSDT, - // else use DSDT. - if (*X_DsdtAddress !=3D 0) { + // If X_DSDT is valid then use X_DSDT and ignore DSDT, else use DSDT. + if ((X_DsdtAddress !=3D NULL) && (*X_DsdtAddress !=3D 0)) { DsdtPtr =3D (UINT8*)(UINTN)(*X_DsdtAddress); - } else if (*DsdtAddress !=3D 0) { + } else if ((DsdtAddress !=3D NULL) && (*DsdtAddress !=3D 0)) { DsdtPtr =3D (UINT8*)(UINTN)(*DsdtAddress); } else { - // Both DSDT and X_DSDT cannot be zero. + // Both DSDT and X_DSDT cannot be invalid. #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64) if (Trace) { // The DSDT Table is mandatory for ARM systems // as the CPU information MUST be presented in // the DSDT. IncrementErrorCount (); - Print (L"ERROR: Both X_DSDT and DSDT are NULL.\n"); + Print (L"ERROR: Both X_DSDT and DSDT are invalid.\n"); } #endif return; -- '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 (#53404): https://edk2.groups.io/g/devel/message/53404 Mute This Topic: https://groups.io/mt/69929568/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53406+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518867888596.2616870968993; Mon, 20 Jan 2020 03:14:27 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id nRquYY1788612xCzt40lQrce; Mon, 20 Jan 2020 03:14:27 -0800 X-Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.77]) by mx.groups.io with SMTP id smtpd.web12.9144.1579518866403786189 for ; Mon, 20 Jan 2020 03:14:26 -0800 X-Received: from DB6PR0801CA0050.eurprd08.prod.outlook.com (2603:10a6:4:2b::18) by VI1PR0801MB2000.eurprd08.prod.outlook.com (2603:10a6:800:8e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: from VE1EUR03FT055.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::206) by DB6PR0801CA0050.outlook.office365.com (2603:10a6:4:2b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53406+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT055.mail.protection.outlook.com (10.152.19.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: ("Tessian outbound 0eaff1016ea4:v40"); Mon, 20 Jan 2020 11:14:22 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 19923e20d1790223 X-CR-MTA-TID: 64aa7808 X-Received: from 7bf45c6a4cb8.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F5F5139B-418F-4E13-9169-D0C81D5A7AC6.1; Mon, 20 Jan 2020 11:14:16 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7bf45c6a4cb8.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N7HvZInm+3wKtFIbUh14ckzs8zyVCCCpLlwcvezIOilJaM7fTMcXEZKupT0EGHAF/VXT1OWGJ73EtpsMatVDhTB28wpV3zcEe0gbXu0aM3IaQTWBeeAZJIRIufgFWbOQZE6HYqssmdxR0Rw0orlfDGRjLkPXX58qHep6t+vCZ+mQs7tXA9JM7ZNFopJ4vEL9sNUNtLuQlPE7soVZSjImhn/+Td0G5aM177LnsVVlICE16CUVSdApreJA5D7wGcyZVCc2yQ3jNJxQoGwZ1HbiR8+WF0ppDwKj/YHKinRSxotPDl60nfTofdbAFFiwk6C2i29SqetkoSSkUf0Pp3MqaQ== 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=XaoP7PGdC4nfO7YPTVVZApY8pwYthFX3+/wAyaXnU3Y=; b=BLFYaKg4UO5fZICMyGW4fp1Alt0+xBkIS1H+RfXrv9+Wqe9LWw2Odjnf0yj3z4UanX9i8t1XNxlHAiJ6jAuit+18BwTfOVXHYMAom7/kQZL2yksijCRsUsT0QFRsaaBHgd139WAz33nAXk/d/MxQmnans5adHOqfYHN9q3fEa4XCQVNjB/v0GBbkchoSHT40F/QHP03U7aUY6Aan4eJR4ytG9erm+cb9TXF1+YuWZk0pdhV99Z99pKmtYoxi+UVkoL2/Enlf9/FzTfc0r4Z8NAvyFYJ1fPNj0unYpf71KgvCrcx7ZCbOWGcKIWYFa48Id99C9OlNCBqBHMKHoY2ZHQ== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0801CA0049.eurprd08.prod.outlook.com (2603:10a6:4:2b::17) by VI1PR08MB4016.eurprd08.prod.outlook.com (2603:10a6:803:ed::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Mon, 20 Jan 2020 11:14:15 +0000 X-Received: from VE1EUR03FT041.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::207) by DB6PR0801CA0049.outlook.office365.com (2603:10a6:4:2b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Mon, 20 Jan 2020 11:14:15 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT041.mail.protection.outlook.com (10.152.19.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:15 +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.1415.2; Mon, 20 Jan 2020 11:14:05 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:05 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 04/11] ShellPkg: acpiview: SLIT: Validate global pointer before use Date: Mon, 20 Jan 2020 11:13:44 +0000 Message-ID: <20200120111351.29184-5-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(396003)(346002)(136003)(376002)(39860400002)(189003)(199004)(2616005)(8936002)(478600001)(4326008)(7696005)(86362001)(2906002)(44832011)(81166006)(54906003)(336012)(426003)(186003)(81156014)(70206006)(316002)(8676002)(1076003)(6916009)(70586007)(26005)(356004)(15650500001)(6666004)(5660300002)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB4016;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37a7d3aa-efdd-4bc5-b19f-08d79d99e6f2 X-MS-TrafficTypeDiagnostic: VI1PR08MB4016:|VI1PR0801MB2000: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:6430;OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 9kni4DD/1qN9CekvaMU7ClGx2C9m2gQaVlqXIFMrBmdqCIAVxIs1kTEG7P6vMB3vc+sT/7MEJo4JDGxfel7P9voyZzScjaTFN0Uj8EVY88caoJ1LHXg0stvkq3LkwdDuw2tGzYtFQoaRaLQL5I/4M3fnt9FI4p+79tXGY5LKFU/XAFP4+8wAIdm/dFB3/thP98nOA2tDZtfJoE0kcvAyR+Hz6Mo86SA032iy2Dr1xshXwGibyvko/D7ucDXnWj6mvBZ5Fykny/ZwXcst4oKx3E5DU0A3yAUWjEmcb/BZ+VFfLkgSl8DXWmsH/MP6xrLhDOo2kJN8WoJ7kjUJqDucIsh6FFjiUMziBKfuDo0bhjNM65kqywmy1FIyGXrYe7E3oKTkA9b3bjwmcWNNHdFkbwbg7B316Gn3Uz+ooKF4XiaNw/0oPA34ijFKosV0eTrm X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4016 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT055.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: b454141d-0340-4404-e7de-08d79d99e26f X-Microsoft-Antispam-Message-Info: wJgDE+ZiNAhsfHh+HDsSS3+HYjXIMvTNMi0hdTtKAD/JAtnuMNtE1NA4wKSftMZysz4iGw23BJQeXPtk0dzDqvBfwsBWjkr+wzV6qnb66jMZAmo42NcorWJ7ljCz2fRADDQAjt17YOr9OKBO0/ZbzjzyAsYU2nqflUiX0r+wcJQpAECLeEzwgbRMImA4w7JB82nRLfxF20gDSO8IvhE204P2k4pyN2YjjihgqBlPkXA7LljN8TZQHAIiGqRqbSdoEYKSMWIgoUZqEE6QDuLpgeu97rfm7doM16+ir3H8kDAssfzQpaiBdWVjJhRMH4ZEeOcZfW+rR3nv0nzGz/sWpUKRvrn0JUUm/q86SJY91MUuIXrK13LIuyn45Q0k0RjQR8zG59UjJNUByW4J9z2WsoOx+0SS5+aLiRah1RyoyLEfH9HBbLedwMcc/SQUQNr0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:22.5365 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37a7d3aa-efdd-4bc5-b19f-08d79d99e6f2 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB2000 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: qB28iEVO8ElinAlxfH5xnJ0Ix1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518867; bh=yNxlzkBBW7YG9UsnOtZRLW+a1qyrFxB4IMol81lKRhQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=DbG1sZHG+6z+sgINld0+RM1PKsbLRw9VJMppsn3LBqraMCniZ60JJLMZBfBlvtr6OBJ 0mli8M6ul9lpYTX4wvVGbWqlJ8q9HOLkVqEpjl2emWGHKXwbJSMnaVNmv1OiicpTQXSBg Khu2PPV4PosexaWmhNALHSSrbcakVHUxGFQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if SlitSystemLocalityCount pointer has been successfully updated before it is used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c | 1= 6 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/Slit= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitPa= rser.c index ca2808db526b1bbb79aeb21ccfc0ae6c79b2dfd8..17e2166a09d8615b714e0c51d4d= 93d293fcdf601 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c @@ -1,7 +1,7 @@ /** @file SLIT table parser =20 - Copyright (c) 2016 - 2018, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): @@ -75,9 +75,21 @@ ParseAcpiSlit ( AcpiTableLength, PARSER_PARAMS (SlitParser) ); + + // Check if the values used to control the parsing logic have been + // successfully read. + if (SlitSystemLocalityCount =3D=3D NULL) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient table length. AcpiTableLength =3D %d.\n", + AcpiTableLength + ); + return; + } + LocalityPtr =3D Ptr + Offset; - LocalityCount =3D *SlitSystemLocalityCount; + // We only print the Localities if the count is less than 16 // If the locality count is more than 16 then refer to the // raw data dump. -- '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 (#53406): https://edk2.groups.io/g/devel/message/53406 Mute This Topic: https://groups.io/mt/69929570/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53407+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518868388599.7398944970379; Mon, 20 Jan 2020 03:14:28 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JeuJYY1788612xk6FHLtPDTf; Mon, 20 Jan 2020 03:14:27 -0800 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.49]) by mx.groups.io with SMTP id smtpd.web09.9174.1579518866770659972 for ; Mon, 20 Jan 2020 03:14:27 -0800 X-Received: from VI1PR08CA0135.eurprd08.prod.outlook.com (2603:10a6:800:d5::13) by AM0PR08MB5265.eurprd08.prod.outlook.com (2603:10a6:208:160::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Mon, 20 Jan 2020 11:14:24 +0000 X-Received: from VE1EUR03FT042.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::206) by VI1PR08CA0135.outlook.office365.com (2603:10a6:800:d5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Mon, 20 Jan 2020 11:14:24 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53407+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT042.mail.protection.outlook.com (10.152.19.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:24 +0000 X-Received: ("Tessian outbound ba41a0333779:v40"); Mon, 20 Jan 2020 11:14:24 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: f0239ccfdd5d073c X-CR-MTA-TID: 64aa7808 X-Received: from 9c6fe757eb45.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9871D083-3A00-4424-9DC7-6A39C9BACEB1.1; Mon, 20 Jan 2020 11:14:18 +0000 X-Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9c6fe757eb45.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=knEjJ4kfkE0DpkA8M9p7m6YaQn3AyP1NawDrl5vLyh8sk6Ad4yQXF5Xkjp+7FLhVZhStJRwmkLnUGBpuXrrXSGYeZg7nVL/7qYzUgzDrqLUltitI4aveIHykHEpHWIBJF5Rsyiiga46yjph5a6zgJpfazXn0MSjMXs5R7lbXxfaHKnd0j8pXr3rAHBOOBI4nToXlanJPCZ2Pms6LXmXwr48QzbxqcpivZS2vaexn2A/aa7WXPVnarUkFqFTcublP4GKxoNMt1YaYkvYbxY0iTm20A7to7CPDUaymfJNd48A+raDP+//0z7ENAMQjUnBvmDad5/U/WfIkt5dBx2adoQ== 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=ybphBi9uaecLemE7uspD+F42tyIQldsmHr+yDocKAxs=; b=RwZd/gHe6DxGTZfI/K3uk8GfLzDeIZXJ0BYi1xVsaNOkKQNvdEnV9pA3zX/wEJFZEzlJ+nPvLFdXlS2KQgKaC6iQuW1h4Ut2xw0hlPv5sDgri66ASw6ySqng0h5PFoJafC2zyKTInbJsSnJ1YdzfxXcWyJWLVyjvFsG0cwG4vEzOAz6FOB8qPu2lHZD8RSAN7ixRXwl/+wbCm8KSvxMB5xCqSo68rNrgOGFLJN3z3kLPEu1x6ZzCEhN3wX/bnaMkc2MEscb5rV07c8wSBPafDtdhNM9LPmzE3IQek66ZpQxvdsCpZun/lqncgF+Gloxzt4jeYtsFSChmj5LObayLXA== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR0802CA0024.eurprd08.prod.outlook.com (2603:10a6:800:aa::34) by AM6PR08MB4982.eurprd08.prod.outlook.com (2603:10a6:20b:e9::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18; Mon, 20 Jan 2020 11:14:16 +0000 X-Received: from VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::209) by VI1PR0802CA0024.outlook.office365.com (2603:10a6:800:aa::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:15 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT059.mail.protection.outlook.com (10.152.19.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:15 +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.1415.2; Mon, 20 Jan 2020 11:14:06 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:05 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 05/11] ShellPkg: acpiview: SLIT: Validate System Locality count Date: Mon, 20 Jan 2020 11:13:45 +0000 Message-ID: <20200120111351.29184-6-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(346002)(376002)(396003)(136003)(39860400002)(199004)(189003)(36756003)(2906002)(2616005)(70586007)(54906003)(70206006)(1076003)(15650500001)(6916009)(356004)(6666004)(7696005)(86362001)(5660300002)(8676002)(426003)(4326008)(81166006)(26005)(186003)(316002)(336012)(478600001)(8936002)(44832011)(81156014);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR08MB4982;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59bbe369-5bb7-4011-d0f0-08d79d99e7f2 X-MS-TrafficTypeDiagnostic: AM6PR08MB4982:|AM0PR08MB5265: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:6790;OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 9tPzUY/KWFoadmbcmypoHYv8Kbf/DUMZo6ajxGsb18jPS4d/bIhuS+tm38ZL1VEzL1LS4s1SvI5O9Nw0K5edW6ZhDvF8mKvQUuvfSK4FQbzkG/Gpu8vBkVHZWWt2WG67O7C3neH1ETrhGsepEVpSxATsvcVtH7lcU11Z6RqPwL11HKv0a/DXZ2XhUy8Mx66vl40sOka7ORbdGoARSrgwxhVpYZ4OWfM3rwGPxMT6WR0qtMnIWIYHrLz5CNpXGLFIPTJwM/Yo11vB1R9gUct1OdMCWoH41PjImcyAYYP9HOiPRUsSC2zjnlbFqUt7eqcKvvI6GEfKji+bVdKyHJB0ESq4/WZ20pFBTxleVgYKpe/l8JG+XnaGIn6eefAfnAnY5MbFHMR+atD6iEhV8BGqE/jN536vfvc0IasWRd2hsPfITWrvVbC3TmtiS8EgE08c X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4982 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT042.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 2ff077c6-3a59-4ec5-2899-08d79d99e2f2 X-Microsoft-Antispam-Message-Info: OZl+GXIfICyT2dlEHkBDnHcBfEgB6yJ5T8rLuHQqrNwawcCYorHz9g/hNTV88T0bJ4kOkBlGmeClWfVbov5b2tc3D/utuiSX+SAvsdavq6WEhFaE8Ak5REql/SWmy59zYIRpedgGvhWfef28f/LPHd6TnSb0ZnAMzzn/NaUynj9RE2RL0B6v5Y5GGthL6kNtnssjVqrKwEYmMk3gu7dgkOPKNyfjoIyjMzMJ7ZjJQ3SVAWnfO/Bgrke7IAxQCc3JPajviIedceMfrSCLGM1SvYH56B93LTu8VW9tL7HCNRdMrLjgGO1VMs5L98rM6A3DhxWPuWMT6tMeCL7k0lwiymOpB7rACzzc3qx/SUgzAMuU3zZ/X0oqJnH1jXzMvXnQDrAZOjE9Uo6Cg/vTgdtMpOyhKbSBUsH5fGxSJFDoSm0NiKe2mh+tzErg2R+n6LSo X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:24.2130 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59bbe369-5bb7-4011-d0f0-08d79d99e7f2 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5265 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: E9y45CjLJKNOAVVGpFZ6k8B9x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518867; bh=00aADOVykjCFpukPjxYUOKOUobRIOGovKwHGWKFzTqE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=PJSi3ryUTyv6WAB7DtNx+39ZLq3tv/NFRQr0Z3z7o6Al71Vb0Ax/HmfknP5u6pouZX1 YdXjAex6O74FA1QaV+ukeU7URQA+SEE4Ghl+HqzBfTbvVuHX5QrVwcV8nj3BiHFu5kNXQ iVDZab6OjXL70JSNqF12ji+Wt2eBcRBUxAo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 1. Check if the 'Number of System Localities' provided can be represented in the SLIT table. The table 'Length' field is a 32-bit value while the 'Number of System Localities' field is 64-bit long. 2. Check if the SLIT matrix fits in the table buffer. If N is the SLIT locality count, then the matrix used to represent the localities is N*N bytes long. The ACPI table length must be big enough to fit the matrix. 3. Remove (now) redundant 64x64 bit multiplication. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Validate the 'Number of System Localities' Field [Krzysztof] - Remove redundant 64x64 bit multiplication [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c | 4= 7 +++++++++++++++++--- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/Slit= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitPa= rser.c index 17e2166a09d8615b714e0c51d4d93d293fcdf601..e4625ee8b13907893a9b6990ecb= 956baf91cc3b9 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c @@ -30,7 +30,7 @@ STATIC CONST ACPI_PARSER SlitParser[] =3D { /** Macro to get the value of a System Locality **/ -#define SLIT_ELEMENT(Ptr, i, j) *(Ptr + (MultU64x64 (i, LocalityCount)) + = j) +#define SLIT_ELEMENT(Ptr, i, j) *(Ptr + (i * LocalityCount) + j) =20 /** This function parses the ACPI SLIT table. @@ -57,9 +57,9 @@ ParseAcpiSlit ( ) { UINT32 Offset; - UINT64 Count; - UINT64 Index; - UINT64 LocalityCount; + UINT32 Count; + UINT32 Index; + UINT32 LocalityCount; UINT8* LocalityPtr; CHAR16 Buffer[80]; // Used for AsciiName param of ParseAcpi =20 @@ -87,8 +87,45 @@ ParseAcpiSlit ( return; } =20 + /* + Despite the 'Number of System Localities' being a 64-bit field in SLIT, + the maximum number of localities that can be represented in SLIT is li= mited + by the 'Length' field of the ACPI table. + + Since the ACPI table length field is 32-bit wide. The maximum number of + localities that can be represented in SLIT can be calculated as: + + MaxLocality =3D sqrt (MAX_UINT32 - sizeof (EFI_ACPI_6_3_SYSTEM_LOCALIT= Y_DISTANCE_INFORMATION_TABLE_HEADER)) + =3D 65535 + =3D MAX_UINT16 + */ + if (*SlitSystemLocalityCount > MAX_UINT16) { + IncrementErrorCount (); + Print ( + L"ERROR: The Number of System Localities provided can't be represent= ed " \ + L"in the SLIT table. SlitSystemLocalityCount =3D %ld. " \ + L"MaxLocalityCountAllowed =3D %d.\n", + *SlitSystemLocalityCount, + MAX_UINT16 + ); + return; + } + + LocalityCount =3D (UINT32)*SlitSystemLocalityCount; + + // Make sure system localities fit in the table buffer provided + if (Offset + (LocalityCount * LocalityCount) > AcpiTableLength) { + IncrementErrorCount (); + Print ( + L"ERROR: Invalid Number of System Localities. " \ + L"SlitSystemLocalityCount =3D %ld. AcpiTableLength =3D %d.\n", + *SlitSystemLocalityCount, + AcpiTableLength + ); + return; + } + LocalityPtr =3D Ptr + Offset; - LocalityCount =3D *SlitSystemLocalityCount; =20 // We only print the Localities if the count is less than 16 // If the locality count is more than 16 then refer to the -- '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 (#53407): https://edk2.groups.io/g/devel/message/53407 Mute This Topic: https://groups.io/mt/69929571/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53411+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518875267929.4499275592964; Mon, 20 Jan 2020 03:14:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id qgY0YY1788612xuVeiVQHUnI; Mon, 20 Jan 2020 03:14:34 -0800 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.47]) by mx.groups.io with SMTP id smtpd.web09.9177.1579518874049928811 for ; Mon, 20 Jan 2020 03:14:34 -0800 X-Received: from VI1PR0802CA0019.eurprd08.prod.outlook.com (2603:10a6:800:aa::29) by VI1PR0801MB1792.eurprd08.prod.outlook.com (2603:10a6:800:50::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Mon, 20 Jan 2020 11:14:31 +0000 X-Received: from AM5EUR03FT052.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::205) by VI1PR0802CA0019.outlook.office365.com (2603:10a6:800:aa::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:31 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53411+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT052.mail.protection.outlook.com (10.152.17.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:31 +0000 X-Received: ("Tessian outbound e09e55c05044:v40"); Mon, 20 Jan 2020 11:14:31 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 84e9489c0f5561e3 X-CR-MTA-TID: 64aa7808 X-Received: from 9a8575fd3acb.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1005BD7F-B702-4513-9537-68A61EF2C189.1; Mon, 20 Jan 2020 11:14:25 +0000 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9a8575fd3acb.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iS3T51/aVp99IMFK5ezcNTVyTL6lE9os6tTx3xw43ZFjYCw+bdYsK7+CKCIx7hbIVxUtwze69oRPm3wzyFx+amXj29cdymTPtgPyamOkF1CWPgOHj+KY2FrWhj2k7olAjx5KCSHDIWFg6b4nQqozS4fzzwL4SWf8vaXhl9lJJOTL9KNyjxbDdmjZ8+TVDjtFoFvXLdPLneai7kM3JrkDuFu3WMxFmK942wBVT0NsP0ENxEMVr+ven8pcMFZIgUQyGSLBnNH5e/DMTaNvlPzsf/cgMSxAKX15mIab6Helz47Wdi1NyY/w7aTwqKmtnGiMAoX6xseGQML9WeQ0O+B3xQ== 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=nUAaYzvZT/i5TNxH9xD6u4DN5SbwYKTRGqsLp9d5N1E=; b=X8ySt/L4/jqxdPii+FyEse6h3MnZL0XAfwjsv+BG+ksu5bW+UAn/tMZ+LrVkLXV7GvbPY+CO2cGoQbsxloVU6aTF8KwZbgRDfPyRTDq5v27UYfesp5eXXoulC1eEEvra333A2mli1lwS2XZS7hL0hs8i0+QTOq2Si7PdyyWHtgAuXC3s4ZHMbuDrIu4n+r1+xwKy2rAfPbwh/AMMoXhZO0YR2rZrgNwCW+nXorLsccIvsAQ1A9OnZVUjO08PWm0GKhquBvaRQgvDG4FImAdpVgZccdH2z1leL4rfspUAtBalNzU7Ffq9NSNKV0I037mLfW/IsUf0PXwTK3WjBwU6XQ== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR08CA0228.eurprd08.prod.outlook.com (2603:10a6:802:15::37) by AM6PR08MB3128.eurprd08.prod.outlook.com (2603:10a6:209:45::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Mon, 20 Jan 2020 11:14:24 +0000 X-Received: from AM5EUR03FT028.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::203) by VI1PR08CA0228.outlook.office365.com (2603:10a6:802:15::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:24 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT028.mail.protection.outlook.com (10.152.16.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:23 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.1415.2; Mon, 20 Jan 2020 11:14:06 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:06 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 06/11] ShellPkg: acpiview: SRAT: Validate global pointers before use Date: Mon, 20 Jan 2020 11:13:46 +0000 Message-ID: <20200120111351.29184-7-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(136003)(39860400002)(376002)(346002)(396003)(189003)(199004)(81156014)(81166006)(8676002)(478600001)(86362001)(1076003)(356004)(6666004)(6916009)(8936002)(70586007)(70206006)(26005)(7696005)(44832011)(2616005)(36756003)(54906003)(316002)(2906002)(5660300002)(336012)(426003)(4326008)(186003)(15650500001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR08MB3128;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6aebd011-5e6b-462b-2c6a-08d79d99ec43 X-MS-TrafficTypeDiagnostic: AM6PR08MB3128:|VI1PR0801MB1792: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:3513;OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: mu+GbLgwFaEh+LswlNS36+z/2jfeZlBxguTwBZzdMSH8vgqYIm8AYrcClRkga6tdanVFlQsqdmh0voyV+nz8GnLIwjaTQpHNLeT2T8Scfv6MAw0fMSBU2Q9PKu46lwsbvXbUemPyARnhZeByO4aDkBgqc2BcoYf7ow0PZWGwReN6At9ZLC65bNT1fyqMzPo6Blb8JtvxK5cDAhZKaLXrgQKNNxZcRKvZeL+U2RMJu4FRj4GprKQD+TXyCeEQb2CmUmss1So7b7clUXWuepJRbYxlpdzVWjZmEOu5j+l85UbYz70OH/38oirp0it8YVx2XIxnKOvWXFwIjyaAh7hEYiSc11oRHyo//akDoNNUWSGYD2isTjvFT7uEXW9e0M9i31VFeBji8EFY/69gSwALgf2qZIwN02DvChnQYGmkIVlEkTf2YN3He4eT/N9okujB X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3128 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT052.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c5f2db33-042c-4fb2-a4d5-08d79d99e7a8 X-Microsoft-Antispam-Message-Info: vCo+O9uTxs7pajYYv5+60o4+i9INcGloQJ/IlhPdvYoTB4YKgHuxbnU7+11RUxNsMjkDtN3ua1JZav5H6rVlWT0E+oWzpAgxo+gk8Sj/huxCbxcqFK5gmRE9UiC+PfOsOcoVQmLO7h2fZUzToMy+G0rqFEasKetWfEzfKaBTxpSCHp8RHnCjpHQSzyXeToZ+IiTHhDeDk8xtKQNJXUOl9VqxGcSsPafcSHhffDJfRoywJjaDgd/CqIcpE55rXElDiQWBGL96ws/dsp9gZ1bkApjS1af7VDD0CkW1OXFrO4y1f9+1zaVl9G8o25D2hsfjbwFT6CK7m6w/wrEDoawmePx1o6R9vu0my775OpMtymzaPhMmGmyqoN9JRBNN7ZjiQa0riPzuekbgD0nDcuiab87oXItlcbXAjDAC5j3sGSBfjHeRLSARpjsCzBFk32jj X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:31.4986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6aebd011-5e6b-462b-2c6a-08d79d99ec43 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1792 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: e9V0I4tVpuYyRiuoTNFa7FWLx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518874; bh=WUsL6qraBquBydKFb8O+koZyzOBhIWev+rl49zzCMg8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=KbWgEVEsBnnCXrqJ+JfUWOXCfwJSfXBdRrE90D7ZDcJ5cN5gBfRWaUAyVzdVDJKPXe2 64xOMy6JVBE+1v67+tmX4wU0pvBh/F/0hhWm6T5vJ2W9xFnygKlSDINDCfyHX2g+vtkOS i9oKByMukJkMiRvZl/q6Vi+hiHSDWNn8ub0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if SratRAType and SratRALength pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c | 1= 3 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/Srat= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratPa= rser.c index 6fe7bf681132df08133e3e03e3ee3f020d905dd2..3613900ae322483fdd3d3383de4= e22ba75b2128b 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c @@ -399,6 +399,19 @@ ParseAcpiSrat ( PARSER_PARAMS (SratResourceAllocationParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((SratRAType =3D=3D NULL) || + (SratRALength =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient remaining table buffer length to read the " \ + L"Static Resource Allocation structure header. Length =3D %d.\n", + AcpiTableLength - Offset + ); + return; + } + // Make sure the SRAT structure lies inside the table if ((Offset + *SratRALength) > AcpiTableLength) { IncrementErrorCount (); -- '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 (#53411): https://edk2.groups.io/g/devel/message/53411 Mute This Topic: https://groups.io/mt/69929575/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53408+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518871020151.55494784936047; Mon, 20 Jan 2020 03:14:31 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id MxL0YY1788612xji4nDNlyxt; Mon, 20 Jan 2020 03:14:30 -0800 X-Received: from EUR02-HE1-obe.outbound.protection.outlook.com (EUR02-HE1-obe.outbound.protection.outlook.com [40.107.1.43]) by mx.groups.io with SMTP id smtpd.web09.9175.1579518869508528229 for ; Mon, 20 Jan 2020 03:14:30 -0800 X-Received: from DB6PR0801CA0057.eurprd08.prod.outlook.com (2603:10a6:4:2b::25) by DB8PR08MB5324.eurprd08.prod.outlook.com (2603:10a6:10:11e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Mon, 20 Jan 2020 11:14:26 +0000 X-Received: from DB5EUR03FT024.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::204) by DB6PR0801CA0057.outlook.office365.com (2603:10a6:4:2b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:26 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53408+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT024.mail.protection.outlook.com (10.152.20.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:26 +0000 X-Received: ("Tessian outbound ca1df68f3668:v40"); Mon, 20 Jan 2020 11:14:26 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e3761d0607cdb898 X-CR-MTA-TID: 64aa7808 X-Received: from 94236c8067f8.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 647A61CB-639A-4951-96C9-6403F272CC5D.1; Mon, 20 Jan 2020 11:14:21 +0000 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 94236c8067f8.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JQz54aUJWt0fA14v8iP3a+7clfclB1OSW4nznYTTGFkH7gPpCDRu24WdacJSrooDDGSdCG7Muzpft9pNIs8v9zXjH0RxvfaPdjePC3apLb9ZzF86M8AQv1xeJUTwxJbvEhgYKyPtDnZGhR6vmoKD9BcgtKEIWVltuJSig1KXVCQhF0V0/y9proCq5udTeeq4xN/JIvMDP+7YCFrbZz5GAO+d3eYJtAYC/fn2U8osUEi3AzxtGg/g9Jux8WtE36sjjI4ZCd1jHyXZgLtxofMVjrIhiihxZ7bnv6L8t3uOJvdXItY2EDf5g1AQtLne7X0JLiZixkSKSNhVVQlcZa/3cQ== 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=HYJ7Rw4QkZJfj5/oztsTouGVi2AIGuEnwwub7sOxLgg=; b=gKp6UGAJ+EtzQecXENVMh8RnUXpJZrxFiIaRkipX3ezVn85Ap6qpMawYG4B5V9s/G2Shgf/hDK9ZEY1+rzD183iUGc87X2SCXVp6+X7LdFlKlRLX+IJgQ8Cr4GeGPkUmR1rCpWkxmTv4S77Hsb4owfu+H5HPiJ/w44lkv3xV2sYlWwHaDs/mk1SxlyWxRi91y0aNB2jws/vlgPyI6fhLe5UipoicpRB5CKErrQ59RgsrPCFkMjtWd9UM6EN3DiUs1/W5n0NiAtIwujAhC8NXpZoxOSBsPSdDsdK7mbwfKJ5Jso5iBGE1IcfE/LWJ5qDah/tyw7iasD/ubLuHs5b/YQ== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR0802CA0023.eurprd08.prod.outlook.com (2603:10a6:800:aa::33) by VE1PR08MB5069.eurprd08.prod.outlook.com (2603:10a6:803:105::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.22; Mon, 20 Jan 2020 11:14:19 +0000 X-Received: from VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::201) by VI1PR0802CA0023.outlook.office365.com (2603:10a6:800:aa::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:19 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT059.mail.protection.outlook.com (10.152.19.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:19 +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.1415.2; Mon, 20 Jan 2020 11:14:07 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:06 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 07/11] ShellPkg: acpiview: MADT: Validate global pointers before use Date: Mon, 20 Jan 2020 11:13:47 +0000 Message-ID: <20200120111351.29184-8-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(376002)(136003)(39860400002)(396003)(346002)(189003)(199004)(426003)(2616005)(6666004)(2906002)(356004)(44832011)(7696005)(186003)(26005)(316002)(86362001)(4326008)(336012)(5660300002)(70206006)(36756003)(54906003)(70586007)(15650500001)(478600001)(81166006)(81156014)(6916009)(1076003)(8676002)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:VE1PR08MB5069;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f561ff3d-dd2e-4088-0947-08d79d99e93e X-MS-TrafficTypeDiagnostic: VE1PR08MB5069:|DB8PR08MB5324: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:6108;OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: /MZ/L5lFDuWRVyziKwNWc5ddAFPlYW+rhjI+eipgUyHTFbWhcNRwscUfG5k+lvPuimmIjVaCdfATnAhmeewKQ70gD8l/jTVSzl0vZXnltObenUgsg2+NynYG97uzcWD4JgOJed3psCBvIdU7VMuVtes+T1eTXlE1gidXoHHtRZVRlakSancjyVmEXMWbiaNF9yHZA9J2rLYUYSv3k802N7XoL6DXub1RavpUqL0cm1KRRcnHZQaQON+5xGMrsHjK6DU3Z8m4SfuonNxtjfg9m2Bd5ecejaisIWPz+YxtWyW4utvWwjxn9dVIKqMpXuHzBHKK/vKRgqgBy3u+/tMYG2YlXZTPs86SN5WhTZbi5KK2HBS7m9r2nUF/aaB4Zk+j1ky9D+NzAJL5f3CIlgmMDlTEOd8O75CIDyXMCSWgPGRhBN9kBWO1kPtG4t/pyj/p X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5069 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT024.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 69d5b057-24f3-48e2-16fa-08d79d99e4fe X-Microsoft-Antispam-Message-Info: 44dMo7agaIAi2w/hFPeTH1S+NaPLnBaT3LfLcDUzz95B2e653yy6zQgbKqDjdvSKkTk8ezLHmh1pJrjmMeot1tD4CqjFg1THL9k2n+D3K8+jkQq7Bl52c1Voq4KAhKT8uIjZTCJSQHqc2ExjiZFrT5PAhyipLUWkasjiZI3VqK8tjpEqbilaPEJRi1OVHfE+AxDqcQc4aBpuNx1QWxCiwONVgEHIroqvJ68zaEjAa0NdK9LDJDtRWVYARF6us3f/v7r+u+JMo/y70vWd7Uz8ZxIEBAQ8TdOdRbwgCsXSwL+cBzvGr4TVMyU6bP9+v/0P2AQwwzWZaqiPmtUyxKqG8Xlli9OWn1kSi+tZ5X0Okbw27fsDCcmMxRqfML/YLa1EklBk5+AZvHByxJpYsQr+EPulCmKn4J92eVxFbs5NIfb9nyiieOh5J3puQIuFYN+N X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:26.4398 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f561ff3d-dd2e-4088-0947-08d79d99e93e 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5324 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: JTR1O8QWPk0oPGDVeZKkDlInx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518870; bh=Xerwy7mVV0jOdStCqVIMH7bqdAzBESvfigetCdR6iGY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=pBdgsksl/Rvuqr5QqrThnUOiTM15cjMqXGmvFCaXBXSWBnr3+W1tpueVWvu8og7mrz7 o0PX6IGC91rFjCeLu5qsHYVLffwOER5zh8ccHEz7Azu7nL7NWc7WXA+cyiKWl+UzpBeeR oPAqFAk6l7yXeFIU+LCL9+pRtJJ+WvLZ0T4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if the MadtInterruptControllerType and MadtInterruptControllerLength pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c | 1= 3 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/Madt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtPa= rser.c index 90bdafea1970db522e8ed96de7c6e986cdaca5ba..438905cb24f58b8b82e8fe61280= e72f765d578d8 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c @@ -260,6 +260,19 @@ ParseAcpiMadt ( PARSER_PARAMS (MadtInterruptControllerHeaderParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((MadtInterruptControllerType =3D=3D NULL) || + (MadtInterruptControllerLength =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient remaining table buffer length to read the " \ + L"Interrupt Controller Structure header. Length =3D %d.\n", + AcpiTableLength - Offset + ); + return; + } + // Make sure forward progress is made. if (*MadtInterruptControllerLength < 2) { IncrementErrorCount (); -- '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 (#53408): https://edk2.groups.io/g/devel/message/53408 Mute This Topic: https://groups.io/mt/69929572/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53409+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518873926272.7422484615457; Mon, 20 Jan 2020 03:14:33 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mDHGYY1788612xUiJCoRVW1J; Mon, 20 Jan 2020 03:14:33 -0800 X-Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.75]) by mx.groups.io with SMTP id smtpd.web12.9149.1579518872371146975 for ; Mon, 20 Jan 2020 03:14:32 -0800 X-Received: from VI1PR0802CA0015.eurprd08.prod.outlook.com (2603:10a6:800:aa::25) by HE1PR0802MB2571.eurprd08.prod.outlook.com (2603:10a6:3:e2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.24; Mon, 20 Jan 2020 11:14:28 +0000 X-Received: from DB5EUR03FT062.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::204) by VI1PR0802CA0015.outlook.office365.com (2603:10a6:800:aa::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:28 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53409+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT062.mail.protection.outlook.com (10.152.20.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:28 +0000 X-Received: ("Tessian outbound ba41a0333779:v40"); Mon, 20 Jan 2020 11:14:28 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 17ce00c538a2498d X-CR-MTA-TID: 64aa7808 X-Received: from a98c313ca029.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 52E4AC4E-1A97-4BE5-B8B3-24CFC9D90D9F.1; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: from EUR02-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a98c313ca029.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DHkQ3S7SUsqicudulYOgykTBml884IGOQ0LaO7FoaGBTWcrYVmegwIkGNe68ds7gZswMyK++uAS/Zu13EvTG3joyk8b3D3/9IqWXSkDjyopQ6daHkLu/cjNpnouB6pZ8dm36dcY59ismfuss4VZP+ZzuF2wlAAAb9k8t7IFRMRb+5i9fHORt06AJ3aCx+5Ctm0eOXIoKgCEV4adfPwB/6ro+nf6iy/v+WMFj9NeVmboQ0ToteFsvs8kFD4MCapRhSsb57+UDqbfoWy0ng/9hgWG5zfD26NDBFgNwDsc6sUgNUQheK0b/WvmnQTTsEu47Wa5FbbERLX6GJ45khNz3Ag== 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=xbLsXS/cNKfpg3dKgpcfFt4SmkVIkYENWGLisyf6f+U=; b=fn6kVIpOLTGCZdaIi7F5noWiha/tfiShTv2WyKI9i9NqQ/d5eG59QdMFrnMfDI30s6KXnOaoTlpxiY0lE8Pxe5zMaNITRL3nxuy+UXE4piGZaxNik9ZKYe5DCU47ztkMlOj2+Vwd/qe4IygAoU8VYW7wRNtvPAs112SzcgmN0hvnYOznfvBBwZgL/TPZ4KqNAp4T0zswyg+Y2SAlb8toAddZWdsNvQla82lreTi5byzWztOvtly1vJfj/SLaRnEYDD+O2GUvCd32aVt4qjhBmDOFyOxuB0kM0yXjDH+HnG0N+EpDMV/ze0jN0pLG4RI1f8KpdcD753L7wGC9d8jdbw== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR0802CA0023.eurprd08.prod.outlook.com (2603:10a6:800:aa::33) by DB8PR08MB5052.eurprd08.prod.outlook.com (2603:10a6:10:e8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Mon, 20 Jan 2020 11:14:20 +0000 X-Received: from VE1EUR03FT059.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::201) by VI1PR0802CA0023.outlook.office365.com (2603:10a6:800:aa::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:20 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT059.mail.protection.outlook.com (10.152.19.60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:20 +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.1415.2; Mon, 20 Jan 2020 11:14:07 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:07 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 08/11] ShellPkg: acpiview: PPTT: Validate global pointers before use Date: Mon, 20 Jan 2020 11:13:48 +0000 Message-ID: <20200120111351.29184-9-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(346002)(39860400002)(376002)(396003)(136003)(189003)(199004)(2616005)(7696005)(426003)(478600001)(36756003)(70586007)(70206006)(2906002)(4326008)(81166006)(356004)(6666004)(81156014)(44832011)(8676002)(6916009)(54906003)(86362001)(15650500001)(316002)(5660300002)(8936002)(186003)(26005)(1076003)(336012);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR08MB5052;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4af09bb9-ed4a-4a68-27d1-08d79d99ea3a X-MS-TrafficTypeDiagnostic: DB8PR08MB5052:|HE1PR0802MB2571: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:3968;OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: sE1h0Pa5nstmjtDWEEwglKlJg+Cb8cLIKG9/JPGnukSN1+34OlVGRoGZhfFZ1LIwreX8HqFOcw8+WjkNcRvfKOi9T6E4JzsNjjZRbDcFetUKyo0JQI3eG54PXFYQbtgX7JBUKBuiWCjGmoCq6UUlEHHLgAMrcxj0ziiX+FjTx5iUMJOlac/01KBPEPBCtZXmQU2no43b4iY24amXdVGazLjWBNQUGFWnkDvCE6PH2ZptmUw5CRLA51aLVaT25Y4tgq1+nvhpqqpivG/iGG2bR/bw82GmQi/DFaNJYJI60+PZKVPq8gd28GY1zmzd9A5eGu7NStNyU0zP3RjrPfPr1bosQa5TA6v9Jxb04uniN7hxKkr9dX2s8n+8ShG2A+X0uPXthzX1W2EXF1Ty5oILN2c8/u0FUG++7yCpY3H/68iagrk0MCMg/ktThGc3BskO X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5052 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT062.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 64991e39-98c4-4ba0-eda5-08d79d99e584 X-Microsoft-Antispam-Message-Info: PdbsKcdHIISEhQBaX94yK0eMNTgADd+JcVlFNdcwS04MK3ceoNnFDn6VZVBPuDlbVm7XOAGKdId8sw9mvvfivHuJqPvUVphnJ8vGs3LXw58mR7oeIcGgAKOT+XjH1TmeHwORgwt9vSQZiMAogdz80KBaUFCt8x2x9S2MaFva/p5WLvUk0nKuSHwK/qov67i422EtN8wGbPtvYb4sy8wzdFmIlhepoaNgcmkgFwRIArBLUHyIceECzUZV1lGFmJJQuIfj2bbQcF2Xt0332Tdi5QCGVavVlRcaxSCH7OFFqhPQ6dsoLohF54UxSucQP089/PviFrrK3y+c7r+Nhlm4oVI+ya1uNr+Lkb/tQ4cnJLkMJzPr4UG9riSo76uwyNmzGfVoPXHgm1mB36efHjgqGxM5DQ9PD0nqNG6P8uZOERWIFmbSkC9XSvGlDsdOD6Lq X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:28.0911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4af09bb9-ed4a-4a68-27d1-08d79d99ea3a 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2571 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: dLyJj9PTvyzhlkCB0PyOaUUix1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518873; bh=L3BWmURT08qgm4eP760Hao44J0ZK9Zr2YmbW8KJV7Y0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Wokiprn0kwBfqn8Qe4QVneZ638iK9Duvq2+YiqrAZ9LrdCrO23ach6caML/mwI04jX4 b1o3kTK2jpAhAnFkwU93gFUE2XmYiIdZdcz0ue8OCAh5g7QejwLEOxayEUhF4RCj7tdvK sFfVXnTUZ+cDv7nD0t0nE2zyjkSzWgPc6i0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if the NumberOfPrivateResources, ProcessorTopologyStructureType and ProcessorTopologyStructureLength pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 2= 5 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index 6254b9913fffb429fc54bb1301bf3e4b2e5bf161..675ba75f02b367cd5ad9f2ac23c= 30ed0ab58f286 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -264,6 +264,17 @@ DumpProcessorHierarchyNodeStructure ( PARSER_PARAMS (ProcessorHierarchyNodeStructureParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if (NumberOfPrivateResources =3D=3D NULL) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient Processor Hierarchy Node length. Length =3D %d= .\n", + Length + ); + return; + } + // Make sure the Private Resource array lies inside this structure if (Offset + (*NumberOfPrivateResources * sizeof (UINT32)) > Length) { IncrementErrorCount (); @@ -387,6 +398,7 @@ ParseAcpiPptt ( AcpiTableLength, PARSER_PARAMS (PpttParser) ); + ProcessorTopologyStructurePtr =3D Ptr + Offset; =20 while (Offset < AcpiTableLength) { @@ -400,6 +412,19 @@ ParseAcpiPptt ( PARSER_PARAMS (ProcessorTopologyStructureHeaderParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((ProcessorTopologyStructureType =3D=3D NULL) || + (ProcessorTopologyStructureLength =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient remaining table buffer length to read the " \ + L"processor topology structure header. Length =3D %d.\n", + AcpiTableLength - Offset + ); + return; + } + // Make sure the PPTT structure lies inside the table if ((Offset + *ProcessorTopologyStructureLength) > AcpiTableLength) { IncrementErrorCount (); -- '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 (#53409): https://edk2.groups.io/g/devel/message/53409 Mute This Topic: https://groups.io/mt/69929573/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53410+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15795188750321018.0861209092177; Mon, 20 Jan 2020 03:14:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mgBcYY1788612xr1uXHdVC5f; Mon, 20 Jan 2020 03:14:34 -0800 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.79]) by mx.groups.io with SMTP id smtpd.web09.9176.1579518873521359343 for ; Mon, 20 Jan 2020 03:14:34 -0800 X-Received: from HE1PR08CA0057.eurprd08.prod.outlook.com (2603:10a6:7:2a::28) by VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.24; Mon, 20 Jan 2020 11:14:29 +0000 X-Received: from AM5EUR03FT009.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::204) by HE1PR08CA0057.outlook.office365.com (2603:10a6:7:2a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:29 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53410+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT009.mail.protection.outlook.com (10.152.16.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:29 +0000 X-Received: ("Tessian outbound 28955e0c1ca8:v40"); Mon, 20 Jan 2020 11:14:29 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d073088bfb04a028 X-CR-MTA-TID: 64aa7808 X-Received: from af1b8095a747.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id CA6FD949-0278-4F7B-9351-4077D3D2C431.1; Mon, 20 Jan 2020 11:14:24 +0000 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id af1b8095a747.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=efh1zY4JEiFbppS57woH746cRTnzV6HYSCugs8XIP5IYenr2t2Uegn/8VPKtV0hRprfkZWFz7MW9cH4DVjtpF36TRF3bCtEHVxzsSTRvi21oH0qx+U1ab/ugbIm1gLndNGxTmPjVir93Ajx8ZX82bXDqW/rIikTJLZt49nvQ2FOw/bPXKys1azTg6or+bI1LFL4W2s+o6FVNuzZljZg4AmXVMWd3h/K6jAa1/hwpy6uITcGVTstdebLL3qnB9JCGLvA6GFjIbIMvabW7kAIB2SgKGLqrhZ8RfJlmTeWTxopPzs6s8U6wov+U3i+OH8I7taFBt8srFVeDWVKpd7aw4g== 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=GkCTLbze6b09g15z91J55w0GvF2YPLs1pU1bdDWDKWA=; b=oG7o8oSeIECKYWV7ZCke/Bg93XdKcZLNm39ecG/UFit78lH3iTRvElyRyvIqhWq8uM84I2s/cnlF1d+H2/E3tL8QQu84vuKLB17zYVc1cXevu/2E768G2G/yJ2SZs6BxTwNRxeI1bJ/0YEYJ6F0JShSIljui6/tErGLYrmozGXVE99arg9Ntz2JC82ZzAIHgCmbQsABzXptg1A/bWnKkXX2Q4xEZcsgUwThp//4m3iDbdoZ+K3HfXPp7rPJw6oyXi+YAKQlvUZvnp/1RtstCQTs6A5EDJ6OIRG4plPZy+TLGalqYZJV3dl/aId/oRYVL+pdf/UjeQ7n9KoXkv1UVtQ== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from AM4PR08CA0053.eurprd08.prod.outlook.com (2603:10a6:205:2::24) by DBBPR08MB4331.eurprd08.prod.outlook.com (2603:10a6:10:c4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23; Mon, 20 Jan 2020 11:14:22 +0000 X-Received: from VE1EUR03FT045.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::208) by AM4PR08CA0053.outlook.office365.com (2603:10a6:205:2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT045.mail.protection.outlook.com (10.152.19.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:22 +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.1415.2; Mon, 20 Jan 2020 11:14:08 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:08 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 09/11] ShellPkg: acpiview: IORT: Validate global pointers before use Date: Mon, 20 Jan 2020 11:13:49 +0000 Message-ID: <20200120111351.29184-10-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(376002)(136003)(39860400002)(346002)(396003)(189003)(199004)(2906002)(186003)(336012)(36756003)(478600001)(426003)(70206006)(44832011)(15650500001)(70586007)(4326008)(26005)(8936002)(2616005)(6916009)(81166006)(81156014)(1076003)(6666004)(7696005)(86362001)(5660300002)(19627235002)(316002)(356004)(8676002)(54906003);DIR:OUT;SFP:1101;SCL:1;SRVR:DBBPR08MB4331;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0a7853b-c677-4c9a-76a4-08d79d99eb01 X-MS-TrafficTypeDiagnostic: DBBPR08MB4331:|VI1PR0802MB2302: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:6430;OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: vCKmamIF7bINm+Uh1Fwc1JR9dY61IJN0YSlt6Y+NrUa20rAZCBn8sdOn0FrP/CmGO4yHn0FNcdt0Ut3hG4CIZHzeCqz2bpPb7CQ03l4eLqPRFISqQJVKcBSx2H/nKnNb/X5EWyUtn76Otkq9Vnbws+lUaSPfsCJCZaNcsMcrehm/SoL3epZwGZNzYrF4kafEIHvnA99p8ecqbUUe76+flpDmiTl+yckKYFOvjGrQPhhpli5jqPtSKFts3PfJ4L4BAwFYHQUWIvyHN9/ZxBgRiQj6FVBiKKtCYkWUYW6iEhK9XaXjRhgQIxcF8iUpZ/v5kV3WanAWhHONh9Zzl8I4KWgy9kF3j/H7kX0bwGRI+fWuj30a68STJEEyGRp6fZrO+dLGF5fHDmmTAoMA0dXflrvnj+iYfe38uhZLrYIcxuViv749OjEPz4Zk43l9UJkK X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4331 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 1dcaf466-6f26-4e32-5ca2-08d79d99e6d0 X-Microsoft-Antispam-Message-Info: mKoRDe/IC8JHHlXdnbVle25B0ElydnBRs6rTCeGEMozTC+n74LsqcYFU/9gbLzAFq4h5FSeZTSzfWeKDO+oUbMETCtIyf0IpIgQS7DX73KOlB+bRUHRSk1Lqlc+iZCXoempuRXIeIJed3/C5SjP+iETjHUSC1K5ZZCXtN62ZgHgOmUx6cF69JdOHHU/1K2wjxAkgpbpJ7QpcOlEFJiC5dFxXF/ZO9M/nKzfyV4LvfUccVYIiL+yl7tYHHoHExZOlMsKg3b8of7iZE+8qncQAJg+f5D3YRzxUUuEXk6veNZntb0YRSavJJWnDtVJlYUhMHfZEhrOu6jbpX/dg4FyOJpAcgtmWrags8MtMjekbz/Xxq0ExKCHInGQ5NAf2Yn0X5A5Eh0yhG9pEUbJ3Xn4VEtWUSerHze/1bk9JxBjZqUS122XyLXcMJ4PvY9U9qO/h X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:29.3912 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0a7853b-c677-4c9a-76a4-08d79d99eb01 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: 1h9dVX8CMsiuYvEOBiUFDQzFx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518874; bh=G68YbMq1KoDa8ercgxl00qD6K2e/ubHLpOf8vcdWQio=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=mb9Byxo/1kf1Psy9zfLz3bOVfMsVtJKGxnXfiNFNzhLx3s0ZgBAFG/kx1WZ/X86nhKb NmeNtNaryWAQuOYEwmNmoVIt3y9OgHjSnvBBY22q+xuvSM3BOhwzLuEiZFKlRyzysXOtH CWklmJlgPE73VX6b7Hanp4CV5W7VfjXWp00= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if global (in the scope of the IORT parser) pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c | 5= 2 ++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/Iort= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortPa= rser.c index 72289c7680bc3cd5c444481e8d6a719803202a9b..9d5d937c7b2c19945ca2ad3eba6= 44bdfc09cc3f6 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c @@ -322,6 +322,20 @@ DumpIortNodeSmmuV1V2 ( PARSER_PARAMS (IortNodeSmmuV1V2Parser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((InterruptContextCount =3D=3D NULL) || + (InterruptContextOffset =3D=3D NULL) || + (PmuInterruptCount =3D=3D NULL) || + (PmuInterruptOffset =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient SMMUv1/2 node length. Length =3D %d\n", + Length + ); + return; + } + Offset =3D *InterruptContextOffset; Index =3D 0; =20 @@ -433,6 +447,17 @@ DumpIortNodeIts ( PARSER_PARAMS (IortNodeItsParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if (ItsCount =3D=3D NULL) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient ITS group length. Length =3D %d.\n", + Length + ); + return; + } + Index =3D 0; =20 while ((Index < *ItsCount) && @@ -617,6 +642,18 @@ ParseAcpiIort ( PARSER_PARAMS (IortParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((IortNodeCount =3D=3D NULL) || + (IortNodeOffset =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient table length. AcpiTableLength =3D %d.\n", + AcpiTableLength + ); + return; + } + Offset =3D *IortNodeOffset; NodePtr =3D Ptr + Offset; Index =3D 0; @@ -635,6 +672,21 @@ ParseAcpiIort ( PARSER_PARAMS (IortNodeHeaderParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((IortNodeType =3D=3D NULL) || + (IortNodeLength =3D=3D NULL) || + (IortIdMappingCount =3D=3D NULL) || + (IortIdMappingOffset =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient remaining table buffer length to read the " \ + L"IORT node header. Length =3D %d.\n", + AcpiTableLength - Offset + ); + return; + } + // Make sure the IORT Node is inside the table if ((Offset + (*IortNodeLength)) > AcpiTableLength) { IncrementErrorCount (); -- '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 (#53410): https://edk2.groups.io/g/devel/message/53410 Mute This Topic: https://groups.io/mt/69929574/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53413+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518879239600.8568814405477; Mon, 20 Jan 2020 03:14:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id TYKhYY1788612xvhQqR4HWFO; Mon, 20 Jan 2020 03:14:38 -0800 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.49]) by mx.groups.io with SMTP id smtpd.web11.9085.1579518878030162615 for ; Mon, 20 Jan 2020 03:14:38 -0800 X-Received: from DB6PR0801CA0058.eurprd08.prod.outlook.com (2603:10a6:4:2b::26) by DB6PR0802MB2534.eurprd08.prod.outlook.com (2603:10a6:4:97::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Mon, 20 Jan 2020 11:14:35 +0000 X-Received: from AM5EUR03FT006.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::203) by DB6PR0801CA0058.outlook.office365.com (2603:10a6:4:2b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Mon, 20 Jan 2020 11:14:35 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53413+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT006.mail.protection.outlook.com (10.152.16.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:35 +0000 X-Received: ("Tessian outbound ca1df68f3668:v40"); Mon, 20 Jan 2020 11:14:35 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 1fa2a57134a8f528 X-CR-MTA-TID: 64aa7808 X-Received: from b64afe7d4b3f.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 31A6E7F0-9865-4474-8BE9-97D77CA34261.1; Mon, 20 Jan 2020 11:14:29 +0000 X-Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b64afe7d4b3f.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AMoh67ZJ1+j74kJxwJOuiw1PJOE4BvDmYxJ+EGLEUn4qfUr62hRn9v7JMwu6b2udV4vc/w94bLlEYUP+UEDdgdqSqHQLj0dhnQJi9PsvG/GY5fRCfxY4iDgS7JWiyt0vzMFCsjM+QDG6l0lRWxgCCtGT/TEbuaGCIpdDbJb2Rir619xC8FxMa+Ryrj8wTpl4hzv/N5fmT/wf9EOLIUb4Z9xG5H5Mn/imd3iSSAl6bHDT/eDkw9CtpdbgB5DTP9MHhMzXIgIqoOYGi0C9i5RpHRaIv5R/iLzLBiAbyYbM6eH4cyvQk83uXdTmM7uMjJp2bAwU0s1mI78IKYeZOGS9QQ== 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=/FTqhOtiLfiZRClWBp0QTNU+yFX9jsMdLXV2T6oDsBg=; b=aJeAXyYYIHamSzdlimbKpIplyx3kXZmdelv6i+iDQleO8+INjHvw5DYleQNcIecPIr8bQeTl1XOUxjPwxHsxNabc9dK6ybsp4UrMJzZ6/pZFWatzsvCeLELvsSRBNDt07PtfBEBQoRHgLIliC9XAx5UPWsZUr9mktejtqDC6mHhQ5zDqzPiz8qxxNjlttDrOw3OgqakkwGyf0Yk2g8Qefqu/MqYpLR8wnqQeZX+JtFbyCsYMysjDYQQuwHG3PI09b6WHOQTfinbbnPse5/3FUSiRYi4xwNRK0cxzA/Bcrvqh78hXDsrGvGS+Efr7J6Jt2RfKUNdWxnyUptwdame3Cg== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR08CA0238.eurprd08.prod.outlook.com (2603:10a6:802:15::47) by AM6PR08MB4723.eurprd08.prod.outlook.com (2603:10a6:20b:c8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Mon, 20 Jan 2020 11:14:28 +0000 X-Received: from AM5EUR03FT028.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::202) by VI1PR08CA0238.outlook.office365.com (2603:10a6:802:15::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19 via Frontend Transport; Mon, 20 Jan 2020 11:14:28 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT028.mail.protection.outlook.com (10.152.16.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:27 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.1415.2; Mon, 20 Jan 2020 11:14:08 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:08 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 10/11] ShellPkg: acpiview: GTDT: Validate global pointers before use Date: Mon, 20 Jan 2020 11:13:50 +0000 Message-ID: <20200120111351.29184-11-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(376002)(136003)(346002)(396003)(39860400002)(199004)(189003)(6666004)(356004)(7696005)(15650500001)(44832011)(86362001)(4326008)(5660300002)(186003)(70206006)(70586007)(6916009)(316002)(26005)(36756003)(2616005)(8676002)(81156014)(8936002)(81166006)(54906003)(478600001)(2906002)(1076003)(426003)(336012);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR08MB4723;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6eaec7b-ef06-4562-d6b3-08d79d99ee89 X-MS-TrafficTypeDiagnostic: AM6PR08MB4723:|DB6PR0802MB2534: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:6430;OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: blMiSYVkpAiQTqJjT0KZM4E/isnFTIG+feD4thsChL/T90012bmefxQn80G2SUvhlFO+MZpFEXfnWFJ6o2vGYSG9QySHtMsBRhAR8Fr4dge65YgHcp4apA3PvlTgUFLGWGYYpyQvhPL8UTW6yvyVZ+ZOM4NCA/ppYygPHwD6qkIdlLgDSgy9DQUA9An2DaSIeBZRkLtmbz9z2RrNrMrpxSW8GM2OkjnDO62p64jgo527EztuMNd/qNDRlV8LsfRX399VwmUU/cFCUBRhghG/6zr4MaydnOUBtfJi0XctBqg5kCPC+KU7Yox2TSusEL711NwI8+0Zlkp6aGKvhtXZge1dJPEby9EDL7IhcW50LSACtL8jM9HpT6JgCjZz/qqUEa0nAEFEInoISR8kePTlspiMZ98JCQu5+rjDB7oL8H2SZxd+cKLXdyHWdPlbvO4V X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4723 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 0078fe86-197a-4784-4085-08d79d99e9d7 X-Microsoft-Antispam-Message-Info: sIOcddS5oH3mE4MT+xqLiceBwiMr+69h2RozzHBy9XdGjRbZz4H6drco+0+azO71L8pfwqP/9zZl5aPy5r2/ByTfYy5YkJtUHsmf+GLVS+Qiwooo+REQ+ej73VkcIU5LzfZHxmH+00PsNCuObX2KlM3s18f9QrxtyXMmOkyLSA3D+G/bZb+cyzXOGmGwXC0+sY+TsCcUHk8DcNNar3b3oqXWHoM+POceH8rGay7l6bgzQt8IRkpnXhh/kurLFtwP59fgp1WJQWZ4bVzsbqtatJ3aNJ2lINTXVgqvrXpDevo3prssCzFMhLUHStcL2qpn0J3XC79djKvcy78lWalkyuYKowe2RSccHuFWeXlFxKzlt7KRm7zOU42WIuZHA/EdN3DdEAkl9+xd2zMxMYttCNoJdvlNStAsLRiAb8eUxyuqhizPpkog3bDgOJ3V3KwQ X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:35.3141 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f6eaec7b-ef06-4562-d6b3-08d79d99ee89 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2534 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: Eq8tqj0pD7uSxHx4pADy3FY3x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518878; bh=ZO/7eqEd/TJcEmOM9VawWL0Q8esmrlt0sT2ndpPsGjI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=O7+fBpMUtDATOLUbBo37Qm0wJsbUEAOS9f9TrtT1JnOd/w38AZzKnq8JZ35HYOpg2BC aFHbgBcl98APD0TUS3m1xOWZ0KGRc7Uxk4rj2HguvqtGhdxdW90YD5rFYlYmul5/n5YJn cEUFXceFkUqr2qhe2eIfie4wpQ+b7/39rp4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if global (in the scope of the GTDT parser) pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c | 3= 7 ++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/Gtdt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtPa= rser.c index 57174e14c80072f12b90e1996ebe8f0002d0c404..699a55b549ec3fa61bbd1568988= 21055dc019199 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c @@ -189,6 +189,18 @@ DumpGTBlock ( PARSER_PARAMS (GtBlockParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((GtBlockTimerCount =3D=3D NULL) || + (GtBlockTimerOffset =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient GT Block Structure length. Length =3D %d.\n", + Length + ); + return; + } + Offset =3D *GtBlockTimerOffset; Index =3D 0; =20 @@ -272,6 +284,18 @@ ParseAcpiGtdt ( PARSER_PARAMS (GtdtParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((GtdtPlatformTimerCount =3D=3D NULL) || + (GtdtPlatformTimerOffset =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient table length. AcpiTableLength =3D %d.\n", + AcpiTableLength + ); + return; + } + TimerPtr =3D Ptr + *GtdtPlatformTimerOffset; Offset =3D *GtdtPlatformTimerOffset; Index =3D 0; @@ -290,6 +314,19 @@ ParseAcpiGtdt ( PARSER_PARAMS (GtPlatformTimerHeaderParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((PlatformTimerType =3D=3D NULL) || + (PlatformTimerLength =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient remaining table buffer length to read the " \ + L"Platform Timer Structure header. Length =3D %d.\n", + AcpiTableLength - Offset + ); + return; + } + // Make sure the Platform Timer is inside the table. if ((Offset + *PlatformTimerLength) > AcpiTableLength) { IncrementErrorCount (); -- '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 (#53413): https://edk2.groups.io/g/devel/message/53413 Mute This Topic: https://groups.io/mt/69929578/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- From nobody Fri May 3 12:31:31 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.12 as permitted sender) smtp.mailfrom=bounce+27952+53414+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1579518882393494.6805797024333; Mon, 20 Jan 2020 03:14:42 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NmUmYY1788612xlAgHptLvrh; Mon, 20 Jan 2020 03:14:42 -0800 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.71]) by mx.groups.io with SMTP id smtpd.web10.9240.1579518880700285004 for ; Mon, 20 Jan 2020 03:14:41 -0800 X-Received: from VI1PR08CA0158.eurprd08.prod.outlook.com (2603:10a6:800:d1::12) by AM0PR08MB4612.eurprd08.prod.outlook.com (2603:10a6:208:105::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.24; Mon, 20 Jan 2020 11:14:37 +0000 X-Received: from AM5EUR03FT029.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::206) by VI1PR08CA0158.outlook.office365.com (2603:10a6:800:d1::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.18 via Frontend Transport; Mon, 20 Jan 2020 11:14:37 +0000 Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+53414+1787277+3901457@groups.io; helo=web01.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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT029.mail.protection.outlook.com (10.152.16.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:36 +0000 X-Received: ("Tessian outbound 1da651c29646:v40"); Mon, 20 Jan 2020 11:14:36 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4467f73f2ee61145 X-CR-MTA-TID: 64aa7808 X-Received: from 465b9a6ec0a5.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id AB21292A-D86A-4930-8CA7-41FCE617E43E.1; Mon, 20 Jan 2020 11:14:31 +0000 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 465b9a6ec0a5.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 20 Jan 2020 11:14:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JIc3JxDwqmF4zseRJVZuNZlnVYhqowEM3LMYNc27GgBypv491NZcYjOhJrknFVOnm1t7vmClS2QlWQSuwwbrxlsm5nZH3UCaesG2hFckoMTzfRzAE3NlYjpMYq+PPh/Iis4IfzkIMAMMratE62uf4u+wtjqjpfFfP8DeSc/NxVnTTZmei59orAac4w15PTS9YD4tlYP31kfiwd61xkx7Vjs4W0R7e2+7VqlrUdv8+wr5GoRR3ZvSpU4Ng8/Q52OzvdLWYtd0hxyHN3luTIIf1EY5jfRfklpL0SkrJ/BqSFlC2y/JFS+8BcWvYgvNEBG7xf+LMafct/mHrn4HSKgvnA== 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=MnXt5eEHoGvExUMRqitUn405zehOqKOYzBZTItrVows=; b=kKqtShS9rh95yzDoXFo4azAM7MzUuuFw1u/1zMD6vn+lUEK7qpBeKL0wWmDb54jnELT64Jf8tW6gVIYVt9ac+kzPEMZFY3q75w5RzXZdC7MUmIPDmV7vZLiIcGZzzfq+ZzOiVNFqyU7ZoOOqL8uGDDhLZqcM6fZtwKkV0zO8y2wTS9oNw5/pMooTST1zzcbkXC2TMY+4enyKW8EaTHtq7+3j1JlkKoBTtfAMJI/czZ9Xet9NycgZxCJVFuB+Cr5+dZe/RN9Y+dY5p6G8wKC8jVnJFQP70R+fkOmzvnJcaEdQzYyI28+oYBlosOb357UHDhAC/ESYTcLiMjvU4u2s3w== 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=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from VI1PR08CA0212.eurprd08.prod.outlook.com (2603:10a6:802:15::21) by VI1PR08MB3791.eurprd08.prod.outlook.com (2603:10a6:803:c0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.19; Mon, 20 Jan 2020 11:14:30 +0000 X-Received: from AM5EUR03FT028.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::209) by VI1PR08CA0212.outlook.office365.com (2603:10a6:802:15::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20 via Frontend Transport; Mon, 20 Jan 2020 11:14:30 +0000 Authentication-Results-Original: 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=bestguesspass 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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT028.mail.protection.outlook.com (10.152.16.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.2644.23 via Frontend Transport; Mon, 20 Jan 2020 11:14:29 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1415.2; Mon, 20 Jan 2020 11:14:09 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1779.2; Mon, 20 Jan 2020 11:14:09 +0000 X-Received: from E119924.Arm.com (10.37.9.56) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 20 Jan 2020 11:14:09 +0000 From: "Krzysztof Koch" To: CC: , , , , Subject: [edk2-devel] [PATCH v3 11/11] ShellPkg: acpiview: DBG2: Validate global pointers before use Date: Mon, 20 Jan 2020 11:13:51 +0000 Message-ID: <20200120111351.29184-12-krzysztof.koch@arm.com> In-Reply-To: <20200120111351.29184-1-krzysztof.koch@arm.com> References: <20200120111351.29184-1-krzysztof.koch@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(136003)(376002)(396003)(346002)(199004)(189003)(478600001)(54906003)(4326008)(8676002)(81166006)(186003)(81156014)(1076003)(8936002)(15650500001)(2616005)(316002)(26005)(2906002)(336012)(7696005)(426003)(70586007)(70206006)(86362001)(356004)(6666004)(44832011)(6916009)(36756003)(5660300002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR08MB3791;H:nebula.arm.com;FPR:;SPF:Pass;LANG:en;PTR:InfoDomainNonexistent;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ba8e612-f6a4-49e6-bcf6-08d79d99ef7f X-MS-TrafficTypeDiagnostic: VI1PR08MB3791:|AM0PR08MB4612: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: True X-MS-Oob-TLC-OOBClassifiers: OLM:3826;OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: eZRmNgxPG5AvWtF1Y9+RdOaJwX3F9ThvrcSVBfHk3FfySiCdfjhcs0rUhNvIiEhUk44msIu311ADdHVbpFyTiNKuhAWwvwOnZgS0vzF27VIvC55mzVUSFYN2uZuBxixp22a19M+o9diAdN627le5UFpQ3TP4xqCSyjMHkJjuqGuD3RbL299lsnV28r7JHVgfCo/GIREJz4+6ILk4QkMUtwIpUq9n3S7Ls9QiYiu0RjJ4ap+g93MQfG1th1yaw1YTvBbjp9aLr+eaLhEGXB+2QOIhfWIKoETzUU70RC4FbyZaFuoYyowDt+iwuuEnoA0ra2m1quIPk29wGVp/+S+Va1Dwtl7MfM/cTsYiiU3pooX8oJbJ9PQ9jeH40R0fGdmaTl88LW6OGcrfR1jDH2I8tYVg8YO4tmXv2LYdiJoNJVjmPQaoqTlW3dnNx3s/RxDC X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3791 Original-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=bestguesspass action=none header.from=arm.com; X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 45ff05ea-2bcc-453e-defd-08d79d99eb54 X-Microsoft-Antispam-Message-Info: VhjUa+gbcqifbEVzVcUqV/0cw3WrE7GXEupGPeIIhOGrGaErwKtJ54Bjhyr/Cg1V3zy2gCjAfjYymhypMNn0rBk4BftPpvaptW+2SQLJkwS2AymoHGcosokGuLJGY6RASR0BwVoX412+tdib4pvwf1wX6ZldkosshkoGWqeU0yQzHSADHXgyYVZlHC616riZWsqK5SooNG5VzHYOcybguoID9FFAYDCL3ihg3s1Vp3ZBGbFPjCrqN5PFPN8acXAmkhqUU4JxF43g3z5xQFYAY8geaITu0RhBxjH1L8wa5UBy/aZFBt7MCGYKNKSK0uAAH6RbApaarhi9b2GIhlAUjFlyFz7zTE3hSbStZYhdCjfedmvOMz2WDaPhuGJ8eu/9LsoxYm8mpKMjgqxH9lHxbY0/EEFY46TQz1tBWJV5MQi7Ul8CVTxKCWgU0+DnbK9L X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2020 11:14:36.9287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ba8e612-f6a4-49e6-bcf6-08d79d99ef7f 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4612 Precedence: Bulk List-Unsubscribe: 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,krzysztof.koch@arm.com X-Gm-Message-State: QGkHqy0J8JfI2yF8chMykEdMx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1579518882; bh=mqfpJcP7DjJXtn1ZAuQ4Ze/TTHfrQGo7/BbxF5oGLnM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ne5bsn9+we0TUM151oltj0VOGXbtGb2FWkM++nPAVNBSA7dG8kA5wYMiATL1SnLaEzf 7YnN7jp+QegzyNVHE+aqSkz0EN9S06jfoqi37NWjXZjbD5tQqIGvK6BmATQQpUTTcrZz+ NNqKAmzXWiNS+OwEzV732nWBMGfFY0Mehq8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check if global (in the scope of the DBG2 parser) pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Notes: v3: - Rebase on latest master [Krzysztof] v1: - Test against NULL pointers [Krzysztof] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c | 4= 3 ++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Pa= rser.c index 869e700b9beda4886bf7bc5ae4ced3ab9a59efa3..0f730a306a94329a23fbaf54b59= f1833b44616ba 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c @@ -123,6 +123,24 @@ DumpDbgDeviceInfo ( PARSER_PARAMS (DbgDevInfoParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((GasCount =3D=3D NULL) || + (NameSpaceStringLength =3D=3D NULL) || + (NameSpaceStringOffset =3D=3D NULL) || + (OEMDataLength =3D=3D NULL) || + (OEMDataOffset =3D=3D NULL) || + (BaseAddrRegOffset =3D=3D NULL) || + (AddrSizeOffset =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient Debug Device Information Structure length. " \ + L"Length =3D %d.\n", + Length + ); + return; + } + // GAS Index =3D 0; Offset =3D *BaseAddrRegOffset; @@ -224,6 +242,18 @@ ParseAcpiDbg2 ( PARSER_PARAMS (Dbg2Parser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if ((OffsetDbgDeviceInfo =3D=3D NULL) || + (NumberDbgDeviceInfo =3D=3D NULL)) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient table length. AcpiTableLength =3D %d\n", + AcpiTableLength + ); + return; + } + Offset =3D *OffsetDbgDeviceInfo; Index =3D 0; =20 @@ -239,6 +269,19 @@ ParseAcpiDbg2 ( PARSER_PARAMS (DbgDevInfoHeaderParser) ); =20 + // Check if the values used to control the parsing logic have been + // successfully read. + if (DbgDevInfoLen =3D=3D NULL) { + IncrementErrorCount (); + Print ( + L"ERROR: Insufficient remaining table buffer length to read the " \ + L"Debug Device Information structure's 'Length' field. " \ + L"RemainingTableBufferLength =3D %d.\n", + AcpiTableLength - Offset + ); + return; + } + // Make sure the Debug Device Information structure lies inside the ta= ble. if ((Offset + *DbgDevInfoLen) > AcpiTableLength) { IncrementErrorCount (); -- '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 (#53414): https://edk2.groups.io/g/devel/message/53414 Mute This Topic: https://groups.io/mt/69929579/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-