mirror of
https://github.com/RGBCube/serenity
synced 2025-05-22 16:45:08 +00:00
Kernel: Remove char* versions of path argument / kstring copy methods
The only two paths for copying strings in the kernel should be going through the existing Userspace<char const*>, or StringArgument methods. Lets enforce this by removing the option for using the raw cstring APIs that were previously available.
This commit is contained in:
parent
5121e58d4a
commit
40a942d28b
6 changed files with 14 additions and 21 deletions
|
@ -592,7 +592,8 @@ KResult IPv4Socket::ioctl(FileDescription&, unsigned request, Userspace<void*> a
|
||||||
if (!copy_from_user(&route, user_route))
|
if (!copy_from_user(&route, user_route))
|
||||||
return EFAULT;
|
return EFAULT;
|
||||||
|
|
||||||
auto ifname_or_error = try_copy_kstring_from_user(route.rt_dev, IFNAMSIZ);
|
Userspace<const char*> user_rt_dev((FlatPtr)route.rt_dev);
|
||||||
|
auto ifname_or_error = try_copy_kstring_from_user(user_rt_dev, IFNAMSIZ);
|
||||||
if (ifname_or_error.is_error())
|
if (ifname_or_error.is_error())
|
||||||
return ifname_or_error.error();
|
return ifname_or_error.error();
|
||||||
|
|
||||||
|
|
|
@ -498,7 +498,7 @@ Custody& Process::current_directory()
|
||||||
return *m_cwd;
|
return *m_cwd;
|
||||||
}
|
}
|
||||||
|
|
||||||
KResultOr<NonnullOwnPtr<KString>> Process::get_syscall_path_argument(char const* user_path, size_t path_length) const
|
KResultOr<NonnullOwnPtr<KString>> Process::get_syscall_path_argument(Userspace<char const*> user_path, size_t path_length) const
|
||||||
{
|
{
|
||||||
if (path_length == 0)
|
if (path_length == 0)
|
||||||
return EINVAL;
|
return EINVAL;
|
||||||
|
@ -512,7 +512,8 @@ KResultOr<NonnullOwnPtr<KString>> Process::get_syscall_path_argument(char const*
|
||||||
|
|
||||||
KResultOr<NonnullOwnPtr<KString>> Process::get_syscall_path_argument(Syscall::StringArgument const& path) const
|
KResultOr<NonnullOwnPtr<KString>> Process::get_syscall_path_argument(Syscall::StringArgument const& path) const
|
||||||
{
|
{
|
||||||
return get_syscall_path_argument(path.characters, path.length);
|
Userspace<char const*> path_characters((FlatPtr)path.characters);
|
||||||
|
return get_syscall_path_argument(path_characters, path.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Process::dump_core()
|
bool Process::dump_core()
|
||||||
|
|
|
@ -539,11 +539,7 @@ private:
|
||||||
|
|
||||||
KResultOr<siginfo_t> do_waitid(idtype_t idtype, int id, int options);
|
KResultOr<siginfo_t> do_waitid(idtype_t idtype, int id, int options);
|
||||||
|
|
||||||
KResultOr<NonnullOwnPtr<KString>> get_syscall_path_argument(const char* user_path, size_t path_length) const;
|
KResultOr<NonnullOwnPtr<KString>> get_syscall_path_argument(Userspace<const char*> user_path, size_t path_length) const;
|
||||||
KResultOr<NonnullOwnPtr<KString>> get_syscall_path_argument(Userspace<const char*> user_path, size_t path_length) const
|
|
||||||
{
|
|
||||||
return get_syscall_path_argument(user_path.unsafe_userspace_ptr(), path_length);
|
|
||||||
}
|
|
||||||
KResultOr<NonnullOwnPtr<KString>> get_syscall_path_argument(const Syscall::StringArgument&) const;
|
KResultOr<NonnullOwnPtr<KString>> get_syscall_path_argument(const Syscall::StringArgument&) const;
|
||||||
|
|
||||||
bool has_tracee_thread(ProcessID tracer_pid);
|
bool has_tracee_thread(ProcessID tracer_pid);
|
||||||
|
@ -963,7 +959,8 @@ inline static String copy_string_from_user(const Kernel::Syscall::StringArgument
|
||||||
|
|
||||||
inline static KResultOr<NonnullOwnPtr<KString>> try_copy_kstring_from_user(const Kernel::Syscall::StringArgument& string)
|
inline static KResultOr<NonnullOwnPtr<KString>> try_copy_kstring_from_user(const Kernel::Syscall::StringArgument& string)
|
||||||
{
|
{
|
||||||
return try_copy_kstring_from_user(string.characters, string.length);
|
Userspace<char const*> characters((FlatPtr)string.characters);
|
||||||
|
return try_copy_kstring_from_user(characters, string.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<>
|
template<>
|
||||||
|
|
|
@ -42,16 +42,16 @@ String copy_string_from_user(Userspace<const char*> user_str, size_t user_str_si
|
||||||
return copy_string_from_user(user_str.unsafe_userspace_ptr(), user_str_size);
|
return copy_string_from_user(user_str.unsafe_userspace_ptr(), user_str_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(const char* user_str, size_t user_str_size)
|
Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(Userspace<const char*> user_str, size_t user_str_size)
|
||||||
{
|
{
|
||||||
bool is_user = Kernel::Memory::is_user_range(VirtualAddress(user_str), user_str_size);
|
bool is_user = Kernel::Memory::is_user_range(VirtualAddress(user_str), user_str_size);
|
||||||
if (!is_user)
|
if (!is_user)
|
||||||
return EFAULT;
|
return EFAULT;
|
||||||
Kernel::SmapDisabler disabler;
|
Kernel::SmapDisabler disabler;
|
||||||
void* fault_at;
|
void* fault_at;
|
||||||
ssize_t length = Kernel::safe_strnlen(user_str, user_str_size, fault_at);
|
ssize_t length = Kernel::safe_strnlen(user_str.unsafe_userspace_ptr(), user_str_size, fault_at);
|
||||||
if (length < 0) {
|
if (length < 0) {
|
||||||
dbgln("copy_kstring_from_user({:p}, {}) failed at {} (strnlen)", static_cast<const void*>(user_str), user_str_size, VirtualAddress { fault_at });
|
dbgln("copy_kstring_from_user({:p}, {}) failed at {} (strnlen)", static_cast<const void*>(user_str.unsafe_userspace_ptr()), user_str_size, VirtualAddress { fault_at });
|
||||||
return EFAULT;
|
return EFAULT;
|
||||||
}
|
}
|
||||||
char* buffer;
|
char* buffer;
|
||||||
|
@ -64,18 +64,13 @@ Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(con
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
return new_string.release_nonnull();
|
return new_string.release_nonnull();
|
||||||
|
|
||||||
if (!Kernel::safe_memcpy(buffer, user_str, (size_t)length, fault_at)) {
|
if (!Kernel::safe_memcpy(buffer, user_str.unsafe_userspace_ptr(), (size_t)length, fault_at)) {
|
||||||
dbgln("copy_kstring_from_user({:p}, {}) failed at {} (memcpy)", static_cast<const void*>(user_str), user_str_size, VirtualAddress { fault_at });
|
dbgln("copy_kstring_from_user({:p}, {}) failed at {} (memcpy)", static_cast<const void*>(user_str.unsafe_userspace_ptr()), user_str_size, VirtualAddress { fault_at });
|
||||||
return EFAULT;
|
return EFAULT;
|
||||||
}
|
}
|
||||||
return new_string.release_nonnull();
|
return new_string.release_nonnull();
|
||||||
}
|
}
|
||||||
|
|
||||||
Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(Userspace<const char*> user_str, size_t user_str_size)
|
|
||||||
{
|
|
||||||
return try_copy_kstring_from_user(user_str.unsafe_userspace_ptr(), user_str_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]] Optional<Time> copy_time_from_user(const timespec* ts_user)
|
[[nodiscard]] Optional<Time> copy_time_from_user(const timespec* ts_user)
|
||||||
{
|
{
|
||||||
timespec ts;
|
timespec ts;
|
||||||
|
|
|
@ -20,7 +20,6 @@ struct StringArgument;
|
||||||
|
|
||||||
[[nodiscard]] String copy_string_from_user(const char*, size_t);
|
[[nodiscard]] String copy_string_from_user(const char*, size_t);
|
||||||
[[nodiscard]] String copy_string_from_user(Userspace<const char*>, size_t);
|
[[nodiscard]] String copy_string_from_user(Userspace<const char*>, size_t);
|
||||||
[[nodiscard]] Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(const char*, size_t);
|
|
||||||
[[nodiscard]] Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(Userspace<const char*>, size_t);
|
[[nodiscard]] Kernel::KResultOr<NonnullOwnPtr<Kernel::KString>> try_copy_kstring_from_user(Userspace<const char*>, size_t);
|
||||||
[[nodiscard]] Optional<Time> copy_time_from_user(const timespec*);
|
[[nodiscard]] Optional<Time> copy_time_from_user(const timespec*);
|
||||||
[[nodiscard]] Optional<Time> copy_time_from_user(const timeval*);
|
[[nodiscard]] Optional<Time> copy_time_from_user(const timeval*);
|
||||||
|
|
|
@ -58,7 +58,7 @@ KResultOr<FlatPtr> Process::sys$inode_watcher_add_watch(Userspace<const Syscall:
|
||||||
return EBADF;
|
return EBADF;
|
||||||
auto inode_watcher = description->inode_watcher();
|
auto inode_watcher = description->inode_watcher();
|
||||||
|
|
||||||
auto path = get_syscall_path_argument(params.user_path.characters, params.user_path.length);
|
auto path = get_syscall_path_argument(params.user_path);
|
||||||
if (path.is_error())
|
if (path.is_error())
|
||||||
return path.error();
|
return path.error();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue