RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:27:35 +00:00
Code Issues Activity Actions

Kernel: Fix sys$dbgputstr(...) to take a char* instead of u8*

Browse source 
We always attempt to print this as a string, and it's defined as such in
LibC, so fix the signature to match.
This commit is contained in:
Brian Gianforcaro 2021-08-12 21:41:11 -07:00 • committed by Andreas Kling
parent 1ee1ef5103
commit 5121e58d4a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Process.h
View file

@ -264,7 +264,7 @@ public:
KResultOr<FlatPtr> sys$inode_watcher_add_watch(Userspace<const Syscall::SC_inode_watcher_add_watch_params*> user_params); KResultOr<FlatPtr> sys$inode_watcher_add_watch(Userspace<const Syscall::SC_inode_watcher_add_watch_params*> user_params);
KResultOr<FlatPtr> sys$inode_watcher_remove_watch(int fd, int wd); KResultOr<FlatPtr> sys$inode_watcher_remove_watch(int fd, int wd);
KResultOr<FlatPtr> sys$dbgputch(u8); KResultOr<FlatPtr> sys$dbgputch(u8);
KResultOr<FlatPtr> sys$dbgputstr(Userspace<const u8*>, size_t); KResultOr<FlatPtr> sys$dbgputstr(Userspace<const char*>, size_t);
KResultOr<FlatPtr> sys$dump_backtrace(); KResultOr<FlatPtr> sys$dump_backtrace();
KResultOr<FlatPtr> sys$gettid(); KResultOr<FlatPtr> sys$gettid();
KResultOr<FlatPtr> sys$setsid(); KResultOr<FlatPtr> sys$setsid();

4
Kernel/Syscalls/debug.cpp
View file

@ -25,7 +25,7 @@ KResultOr<FlatPtr> Process::sys$dbgputch(u8 ch)
return 0; return 0;
} }
KResultOr<FlatPtr> Process::sys$dbgputstr(Userspace<const u8*> characters, size_t size) KResultOr<FlatPtr> Process::sys$dbgputstr(Userspace<const char*> characters, size_t size)
{ {
VERIFY_NO_PROCESS_BIG_LOCK(this); VERIFY_NO_PROCESS_BIG_LOCK(this);
if (size == 0) if (size == 0)
@ -39,7 +39,7 @@ KResultOr<FlatPtr> Process::sys$dbgputstr(Userspace<const u8*> characters, size_
return size; return size;
} }
auto result = try_copy_kstring_from_user(reinterpret_cast<char const*>(characters.unsafe_userspace_ptr()), size); auto result = try_copy_kstring_from_user(characters, size);
if (result.is_error()) if (result.is_error())
return result.error(); return result.error();
dbgputstr(result.value()->characters(), size); dbgputstr(result.value()->characters(), size);