RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:48:14 +00:00
Code Issues Activity Actions

Kernel+AK: Add and use Userspace<T>::unsafe_userspace_ptr()

Browse source 
Since we already have the type information in the Userspace template,
it was a bit silly to cast manually everywhere. Just add a sufficiently
scary-sounding getter for a typed pointer.

Thanks @alimpfard for pointing out that I was being silly with tossing
out the type.

In the future we may want to make this API non-public as well.
This commit is contained in:
Andreas Kling 2020-07-31 18:46:55 +02:00
parent 5cd7159629
commit 628b3badfb
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/Process.h
View file

@ -360,13 +360,13 @@ public:
template<typename T>
[[nodiscard]] bool validate_read(Userspace<T*> ptr, size_t size) const
{
return validate_read((const T*)ptr.ptr(), size);
return validate_read(ptr.unsafe_userspace_ptr(), size);
}
template<typename T>
[[nodiscard]] bool validate_write(Userspace<T*> ptr, size_t size) const
{
return validate_write((T*)ptr.ptr(), size);
return validate_write(ptr.unsafe_userspace_ptr(), size);
}
template<typename T>
@ -402,9 +402,9 @@ public:
template<typename T>
[[nodiscard]] bool validate_read_and_copy_typed(T* dest, Userspace<const T*> src)
{
bool validated = validate_read_typed((const T*)src.ptr());
bool validated = validate_read_typed(src);
if (validated) {
copy_from_user(dest, (const T*)src.ptr());
copy_from_user(dest, src);
}
return validated;
}
@ -426,7 +426,7 @@ public:
size *= count;
if (size.has_overflow())
return false;
return validate_write((T*)value.ptr(), size.value());
return validate_write(value, size.value());
}
template<typename DataType, typename SizeType>
@ -445,7 +445,7 @@ public:
[[nodiscard]] String validate_and_copy_string_from_user(Userspace<const char*> user_characters, size_t size) const
{
return validate_and_copy_string_from_user((const char*)user_characters.ptr(), size);
return validate_and_copy_string_from_user(user_characters.unsafe_userspace_ptr(), size);
}
[[nodiscard]] String validate_and_copy_string_from_user(const Syscall::StringArgument&) const;
@ -597,7 +597,7 @@ private:
KResultOr<String> get_syscall_path_argument(const char* user_path, size_t path_length) const;
KResultOr<String> get_syscall_path_argument(Userspace<const char*> user_path, size_t path_length) const
{
return get_syscall_path_argument((const char*)user_path.ptr(), path_length);
return get_syscall_path_argument(user_path.unsafe_userspace_ptr(), path_length);
}
KResultOr<String> get_syscall_path_argument(const Syscall::StringArgument&) const;