From 48a00c0f66b21df1167d7b8cf5a8940c7425c0f9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 13 Sep 2019 22:03:10 -0400 Subject: [PATCH] acpi: Support namespace reads into user addresses. Fixes #15176. --- src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp b/src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp index 3a0e90126f..3b930b947f 100644 --- a/src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp +++ b/src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp @@ -14,6 +14,7 @@ #include +#include #include #include @@ -389,7 +390,10 @@ RingBuffer::~RingBuffer() size_t RingBuffer::Read(void *buffer, ssize_t size) { - return ring_buffer_read(fBuffer, (uint8*)buffer, size); + if (IS_USER_ADDRESS(buffer)) + return ring_buffer_user_read(fBuffer, (uint8*)buffer, size); + else + return ring_buffer_read(fBuffer, (uint8*)buffer, size); }