diff --git a/Kernel/Syscalls/debug.cpp b/Kernel/Syscalls/debug.cpp index c3f4872a36..9f17265148 100644 --- a/Kernel/Syscalls/debug.cpp +++ b/Kernel/Syscalls/debug.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include #include #include +#include namespace Kernel { @@ -19,26 +19,20 @@ KResultOr Process::sys$dump_backtrace() KResultOr Process::sys$dbgputch(u8 ch) { - IO::out8(IO::BOCHS_DEBUG_PORT, ch); + dbgputch(ch); return 0; } KResultOr Process::sys$dbgputstr(Userspace characters, size_t size) { - if (size <= 0) + if (size == 0) return 0; - if (size > NumericLimits::max()) - return EINVAL; - - auto buffer = UserOrKernelBuffer::for_user_buffer(characters, size); - if (!buffer.has_value()) - return EFAULT; - return buffer.value().read_buffered<1024>(size, [&](u8 const* buffer, size_t buffer_size) { - for (size_t i = 0; i < buffer_size; ++i) - IO::out8(IO::BOCHS_DEBUG_PORT, buffer[i]); - return buffer_size; - }); + auto result = try_copy_kstring_from_user(reinterpret_cast(characters.unsafe_userspace_ptr()), size); + if (result.is_error()) + return result.error(); + dbgputstr(reinterpret_cast(result.value()->characters()), size); + return size; } }