linux-kernel - [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1593230.4rVA5fLXq5@aspire.rjw.lan>
Date:   Fri, 01 Dec 2017 15:01:25 +0100
From:   "Rafael J. Wysocki" <rjw@...ysocki.net>
To:     Linux PCI <linux-pci@...r.kernel.org>
Cc:     LKML <linux-kernel@...r.kernel.org>,
        Bjorn Helgaas <bhelgaas@...gle.com>, x86@...r.kernel.org,
        Dave Hansen <dave.hansen@...ux.intel.com>
Subject: [PATCH] x86 / PCI: Make broadcom_postcore_init() check acpi_disabled

From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>

acpi_os_get_root_pointer() may return a valid address even if
acpi_disabled is set, but the host bridge information from the ACPI
tables is not going to be used in that case and the Broadcom host
bridge initialization should not be skipped then, so make
broadcom_postcore_init() check acpi_disabled too to avoid this issue.

Reported-by: Dave Hansen <dave.hansen@...ux.intel.com>
Fixes: 6361d72b04d1 (x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan)
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
---
 arch/x86/pci/broadcom_bus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/arch/x86/pci/broadcom_bus.c
===================================================================
--- linux-pm.orig/arch/x86/pci/broadcom_bus.c
+++ linux-pm/arch/x86/pci/broadcom_bus.c
@@ -97,7 +97,7 @@ static int __init broadcom_postcore_init
 	 * We should get host bridge information from ACPI unless the BIOS
 	 * doesn't support it.
 	 */
-	if (acpi_os_get_root_pointer())
+	if (!acpi_disabled && acpi_os_get_root_pointer())
 		return 0;
 #endif