Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Fix AML Register/Reference accesses

This commit is contained in:
Bananymous 2024-08-15 20:55:18 +03:00
parent eaf06d239c
commit 4dc107f77a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/include/kernel/ACPI/AML/Reference.h
View File

@ -69,10 +69,13 @@ namespace Kernel::ACPI::AML
if (!parse_result.success()) if (!parse_result.success())
return ParseResult::Failure; return ParseResult::Failure;
object = parse_result.node(); object = parse_result.node();
if (object && object->type == AML::Node::Type::Register)
object = static_cast<AML::Register*>(object.ptr())->value;
} }
if (object && object->type == AML::Node::Type::Reference)
object = static_cast<AML::Reference*>(object.ptr())->node;
if (object && object->type == AML::Node::Type::Register)
object = static_cast<AML::Register*>(object.ptr())->value;
if (!conditional) if (!conditional)
{ {
if (!object) if (!object)

2
kernel/include/kernel/ACPI/AML/SizeOf.h
View File

@ -22,6 +22,8 @@ namespace Kernel::ACPI::AML
if (!object_result.success()) if (!object_result.success())
return ParseResult::Failure; return ParseResult::Failure;
auto object_node = object_result.node(); auto object_node = object_result.node();
if (object_node && object_node->type == AML::Node::Type::Register)
object_node = static_cast<AML::Register*>(object_node.ptr())->value;
if (!object_node) if (!object_node)
{ {
AML_ERROR("SizeOf object is null"); AML_ERROR("SizeOf object is null");

6
kernel/include/kernel/ACPI/AML/Store.h
View File

@ -44,9 +44,9 @@ namespace Kernel::ACPI::AML
AML_DEBUG_PRINTLN("}"); AML_DEBUG_PRINTLN("}");
#endif #endif
if (!destination->store(source)) if (auto stored = destination->store(source))
return ParseResult::Failure; return ParseResult(stored);
return ParseResult(destination); return ParseResult::Failure;
} }
}; };