RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 19:05:08 +00:00
Code Issues Activity Actions

Kernel: Use Userspace<T> in sys$get_dir_entries()

Browse source
This commit is contained in:
Andreas Kling 2021-03-01 15:04:31 +01:00
parent b5f32be577
commit a1a82c1d95
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Process.h
View file

@ -261,7 +261,7 @@ public:
KResultOr<int> sys$purge(int mode); KResultOr<int> sys$purge(int mode);
KResultOr<int> sys$select(const Syscall::SC_select_params*); KResultOr<int> sys$select(const Syscall::SC_select_params*);
KResultOr<int> sys$poll(Userspace<const Syscall::SC_poll_params*>); KResultOr<int> sys$poll(Userspace<const Syscall::SC_poll_params*>);
KResultOr<ssize_t> sys$get_dir_entries(int fd, void*, ssize_t); KResultOr<ssize_t> sys$get_dir_entries(int fd, Userspace<void*>, ssize_t);
KResultOr<int> sys$getcwd(Userspace<char*>, size_t); KResultOr<int> sys$getcwd(Userspace<char*>, size_t);
KResultOr<int> sys$chdir(Userspace<const char*>, size_t); KResultOr<int> sys$chdir(Userspace<const char*>, size_t);
KResultOr<int> sys$fchdir(int fd); KResultOr<int> sys$fchdir(int fd);

10
Kernel/Syscalls/get_dir_entries.cpp
View file

@ -29,18 +29,18 @@
namespace Kernel { namespace Kernel {
KResultOr<ssize_t> Process::sys$get_dir_entries(int fd, void* buffer, ssize_t size) KResultOr<ssize_t> Process::sys$get_dir_entries(int fd, Userspace<void*> user_buffer, ssize_t user_size)
{ {
REQUIRE_PROMISE(stdio); REQUIRE_PROMISE(stdio);
if (size < 0) if (user_size < 0)
return EINVAL; return EINVAL;
auto description = file_description(fd); auto description = file_description(fd);
if (!description) if (!description)
return EBADF; return EBADF;
auto user_buffer = UserOrKernelBuffer::for_user_buffer((u8*)buffer, size); auto buffer = UserOrKernelBuffer::for_user_buffer(user_buffer, static_cast<size_t>(user_size));
if (!user_buffer.has_value()) if (!buffer.has_value())
return EFAULT; return EFAULT;
return description->get_dir_entries(user_buffer.value(), size); return description->get_dir_entries(buffer.value(), user_size);
} }
} }