From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=6kpCVZ+n; spf=pass (domain: arm.com, ip: 40.107.4.77, mailfrom: krzysztof.koch@arm.com) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.77]) by groups.io with SMTP; Mon, 19 Aug 2019 01:25:52 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bp4Ma1psaPdNQNm5WpIqDSmKd0sBFRlvV3d3B5D3fw4=; b=6kpCVZ+nrF5Py9TCULYUF8D/I8q7g94Fu1tFN88nigTna81aagcyc7hfxcCfsVD4DGw1g8DOWC806p1DK+lnDLQKeNB2/Usldk1HJZtJo1sVYI3ey3GDmxKymU2zxlHtkkwfbeKgoTWEKy0ev2pHJ4DMBzi3uPutkn08JYFj1YY= Received: from DB6PR0802CA0047.eurprd08.prod.outlook.com (2603:10a6:4:a3::33) by HE1PR0801MB1852.eurprd08.prod.outlook.com (2603:10a6:3:7c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.16; Mon, 19 Aug 2019 08:25:48 +0000 Received: from VE1EUR03FT018.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::205) by DB6PR0802CA0047.outlook.office365.com (2603:10a6:4:a3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Mon, 19 Aug 2019 08:25:47 +0000 Authentication-Results: spf=temperror (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=temperror action=none header.from=arm.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT018.mail.protection.outlook.com (10.152.18.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Mon, 19 Aug 2019 08:25:46 +0000 Received: ("Tessian outbound 6d016ca6b65d:v26"); Mon, 19 Aug 2019 08:25:46 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 62da83da5c151e93 X-CR-MTA-TID: 64aa7808 Received: from c5e0cc3ac4ca.1 (cr-mta-lb-1.cr-mta-net [104.47.12.56]) by 64aa7808-outbound-1.mta.getcheckrecipient.com id 681930C6-07A5-4AA9-9699-F04FC41D523E.1; Mon, 19 Aug 2019 08:25:38 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2056.outbound.protection.outlook.com [104.47.12.56]) by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c5e0cc3ac4ca.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384); Mon, 19 Aug 2019 08:25:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OajHbOdJEBne5ZmvcoC4TdXKsx2s1MYC+LKueJcgb8jHSWbXjT+KqHGS/RuRANRkdan4DNgyBDq+c4zUPXMRpoaecFlydbvHQesoR0pAMUI861U1eXwHLBhjwBCK0XNAWNdsqYvDSIbcBR75POb3deSGlahJjTiKI3VEC5n6K7BgkX8YK8vuHS7zZ4RN/zPPqSxjxKhthGMdtfX18Kn9S9EBoAAdJV3rmWr9OTetqRr0lyioxG7Me9HlXd9WCCNDC3Y1QJMJDjfi5DpX4d9z2Ch01U1QhKCPVQgqVeDSToAeJiLTHRozeiR8ofQv4dJ8sEwoj2eRTZopeS83R3XW9A== 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=Bp4Ma1psaPdNQNm5WpIqDSmKd0sBFRlvV3d3B5D3fw4=; b=G96fpHUktxa7T2fYDzmOSqIMqIV7P+SkAJ/1kzZKdO6dokzV7agRa3fQ4DVThZ7GTBdLTp5zMmKCOeQDnTABuk/Bc6fpRO2Win1PEX/wRLmL6RIKIBAoZWIQ1wO8rm0uomDaBlSQQTcWltg0ZUu7ZiVTAr5OQM4gg/Ff/h+XHyXRryfWRDQKX8LauuK02hvGPdtlzDK+aR2XydBkSU0x31QfDj5bt2jlcPQ6lkbo9XIlHeQ+nBWePJGGvDO2fD4S2nXhukT8mRixfuiX7pcOlwEK4I0TI5Ozg82r/v6WmJTNGQ0JQdfwR5KuF7kJYedP9GR+anY9vmwBDupu4fp6TA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=temperror action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bp4Ma1psaPdNQNm5WpIqDSmKd0sBFRlvV3d3B5D3fw4=; b=6kpCVZ+nrF5Py9TCULYUF8D/I8q7g94Fu1tFN88nigTna81aagcyc7hfxcCfsVD4DGw1g8DOWC806p1DK+lnDLQKeNB2/Usldk1HJZtJo1sVYI3ey3GDmxKymU2zxlHtkkwfbeKgoTWEKy0ev2pHJ4DMBzi3uPutkn08JYFj1YY= Received: from VI1PR08CA0172.eurprd08.prod.outlook.com (2603:10a6:800:d1::26) by DB8PR08MB4955.eurprd08.prod.outlook.com (2603:10a6:10:38::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.18; Mon, 19 Aug 2019 08:25:36 +0000 Received: from DB5EUR03FT045.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::204) by VI1PR08CA0172.outlook.office365.com (2603:10a6:800:d1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2178.16 via Frontend Transport; Mon, 19 Aug 2019 08:25:36 +0000 Authentication-Results-Original: spf=temperror (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=temperror action=none header.from=arm.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of arm.com: DNS Timeout) Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT045.mail.protection.outlook.com (10.152.21.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2178.16 via Frontend Transport; Mon, 19 Aug 2019 08:25:35 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) 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, 19 Aug 2019 08:25:21 +0000 Received: from E119924.Arm.com (10.37.8.183) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Mon, 19 Aug 2019 08:25:21 +0000 From: "Krzysztof Koch" To: CC: , , , , , Subject: [PATCH v2 03/11] ShellPkg: acpiview: FADT: Validate global pointer before use Date: Mon, 19 Aug 2019 10:25:14 +0200 Message-ID: <20190819082514.30936-1-krzysztof.koch@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;IPV:NLI;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(376002)(39860400002)(346002)(396003)(136003)(2980300002)(189003)(199004)(53416004)(15650500001)(305945005)(1076003)(8676002)(2616005)(476003)(70206006)(36756003)(16586007)(6916009)(356004)(50226002)(6666004)(54906003)(6306002)(70586007)(336012)(48376002)(5660300002)(14444005)(47776003)(2351001)(186003)(966005)(8936002)(478600001)(50466002)(316002)(81166006)(26005)(63350400001)(486006)(426003)(51416003)(86362001)(7696005)(126002)(4326008)(63370400001)(2906002)(53936002)(44832011)(81156014);DIR:OUT;SFP:1101;SCL:1;SRVR:DB8PR08MB4955;H:nebula.arm.com;FPR:;SPF:TempError;LANG:en;PTR:InfoDomainNonexistent;MX:1;A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c697285-c036-4c04-f712-08d7247ed5a1 X-Microsoft-Antispam-Untrusted: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328);SRVR:DB8PR08MB4955; X-MS-TrafficTypeDiagnostic: DB8PR08MB4955:|HE1PR0801MB1852: X-MS-Exchange-PUrlCount: 1 X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882; X-Forefront-PRVS: 0134AD334F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info-Original: 14NvDOdZEg9WwlvAmdTdkEYh0VfPF4Bf0EnYdXTJlC/AV49nmyFlwh1mXfHXpTPP3joJPzFKsthp+vBhtnZcY0Rcpb16KAQh9zHIYV/tZnWaI92zK7gIfjwxlNG4aeLSma/HiOgIEyvirecnonEVxtQIxfFlrHUb1xxaiPEvmj7tK0MhEXdYOSsMOOQa8ObUvYIrWd7ecVbld38/k4dioKAoXHCtsTKTWDIt3EqvER3IJZV7P++i4+TokQvfW9wR6fjnvHljsEa+fFTDemyVnp+AqBxtpH8qV6Jm2vll1xyQt7QyJAahl79xXdVyDeR6Ov8zSO0CP2vQWH1Vh/xZvqEDbCCMmYhByFmWJJPnpgkNbt6U0y+vGcKSNA9l+oXc5KN8FduIXDsIN7egp18TlnmjzMBLb2m1cxXWYB0Jd4Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB4955 Original-Authentication-Results: spf=temperror (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=temperror action=none header.from=arm.com; Return-Path: Krzysztof.Koch@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT018.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123;IPV:CAL;SCL:-1;CTRY:IE;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(346002)(376002)(396003)(136003)(2980300002)(199004)(189003)(336012)(63350400001)(81166006)(63370400001)(8936002)(305945005)(8676002)(426003)(81156014)(26005)(50226002)(36906005)(966005)(316002)(76130400001)(2351001)(478600001)(22756006)(54906003)(14444005)(126002)(26826003)(86362001)(50466002)(6666004)(70206006)(16586007)(186003)(15650500001)(53416004)(70586007)(36756003)(2906002)(44832011)(7696005)(6306002)(51416003)(6916009)(4326008)(476003)(1076003)(5660300002)(48376002)(2616005)(486006)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR0801MB1852;H:64aa7808-outbound-1.mta.getcheckrecipient.com;FPR:;SPF:TempError;LANG:en;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;A:1;MX:1; X-MS-Office365-Filtering-Correlation-Id-Prvs: 9ba80604-0d27-4720-c8aa-08d7247ecf3d X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(710020)(711020)(4605104)(1401327)(2017052603328);SRVR:HE1PR0801MB1852; NoDisclaimer: True X-Forefront-PRVS: 0134AD334F X-Microsoft-Antispam-Message-Info: 0clg114+hh2xYL1d3XgLY25C7rNTAkSD3g/V5AazPW1N2wczRE1zHBKr4NzWan/7Hp2XfYS7C/mcam8XuznMWc9N9EidBPwffXkboPUhu2AwdTiUdx6Q6iR9DbGFQhT2uDrYVHrULEU6yF1GomajqZAqSgdeRm7FOMbJeygdrUMzWn+pOmiYjX5DaihR8plIxZzpQHsIKpEt7MUC8s2kCQJjOWGXeQAjzZyP9jze2aNYfbZwkJ/WuNIK1qlG98Q8J2j1aG8huicFzXMsUJGisfDP8V4iitleOs3VFc8I+81oaIGaiwYcq/knH81I20Q5Qzlq0B10OesZQ9ac3Ry4iNN5Zkx0eUlaTG5rh0ECAAou63HMCBgqd7Q6neFdwFCLipdz7yX6ZKj2lZiw1HCpCtA2VdE5aoWXsjDHmIJIORg= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2019 08:25:46.3534 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c697285-c036-4c04-f712-08d7247ed5a1 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: HE1PR0801MB1852 Content-Type: text/plain Check if global pointers have been successfully updated before they are used for further table parsing. Signed-off-by: Krzysztof Koch --- Changes can be seen at: https://github.com/KrzysztofKoch1/edk2/tree/612_add_pointer_validation_v2 Notes: v1: - Test against NULL pointers [Krzysztof] v2: - Do not require FadtMinorRevision and X_DsdtAddress pointers to be valid in order to process the remaining ACPI tables [Zhichao] ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c index e40c9ef8ee4b3285faf8c6edf3cb6236ee367397..6859c4824c2866fd3eb9a789a8dfc950724b27ca 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c @@ -204,9 +204,11 @@ ParseAcpiFadt ( ); if (Trace) { - Print (L"\nSummary:\n"); - PrintFieldName (2, L"FADT Version"); - Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision); + if (FadtMinorRevision != NULL) { + Print (L"\nSummary:\n"); + PrintFieldName (2, L"FADT Version"); + Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision); + } if (*GetAcpiXsdtHeaderInfo ()->OemTableId != *AcpiHdrInfo.OemTableId) { IncrementErrorCount (); @@ -214,21 +216,20 @@ ParseAcpiFadt ( } } - // If X_DSDT is not zero then use X_DSDT and ignore DSDT, - // else use DSDT. - if (*X_DsdtAddress != 0) { + // If X_DSDT is valid then use X_DSDT and ignore DSDT, else use DSDT. + if ((X_DsdtAddress != NULL) && (*X_DsdtAddress != 0)) { DsdtPtr = (UINT8*)(UINTN)(*X_DsdtAddress); - } else if (*DsdtAddress != 0) { + } else if ((DsdtAddress != NULL) && (*DsdtAddress != 0)) { DsdtPtr = (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)'