From 3945e239e1108a9f72f1bda141198bb97b485ade Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Tue, 18 Jan 2022 10:53:28 +0200 Subject: [PATCH] Kernel: Don't populate the ACPI SysFS directory with a disabled ACPI This would cause a nullptr dereference on ACPI::Parser::the(). --- Kernel/Firmware/SysFSFirmware.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Kernel/Firmware/SysFSFirmware.cpp b/Kernel/Firmware/SysFSFirmware.cpp index e1f6c084be..b0ee02e562 100644 --- a/Kernel/Firmware/SysFSFirmware.cpp +++ b/Kernel/Firmware/SysFSFirmware.cpp @@ -22,7 +22,8 @@ UNMAP_AFTER_INIT void FirmwareSysFSDirectory::initialize() void FirmwareSysFSDirectory::create_components() { m_components.append(BIOSSysFSDirectory::must_create(*this)); - m_components.append(ACPI::ACPISysFSDirectory::must_create(*this)); + if (ACPI::is_enabled()) + m_components.append(ACPI::ACPISysFSDirectory::must_create(*this)); m_components.append(PowerStateSwitchNode::must_create(*this)); }