1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:57:44 +00:00

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

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

View file

@ -45,6 +45,7 @@ public:
} }
FlatPtr ptr() const { return m_ptr; } FlatPtr ptr() const { return m_ptr; }
T unsafe_userspace_ptr() const { return (T)m_ptr; }
#else #else
Userspace(T ptr) Userspace(T ptr)
: m_ptr(ptr) : m_ptr(ptr)

View file

@ -360,13 +360,13 @@ public:
template<typename T> template<typename T>
[[nodiscard]] bool validate_read(Userspace<T*> ptr, size_t size) const [[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> template<typename T>
[[nodiscard]] bool validate_write(Userspace<T*> ptr, size_t size) const [[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> template<typename T>
@ -402,9 +402,9 @@ public:
template<typename T> template<typename T>
[[nodiscard]] bool validate_read_and_copy_typed(T* dest, Userspace<const T*> src) [[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) { if (validated) {
copy_from_user(dest, (const T*)src.ptr()); copy_from_user(dest, src);
} }
return validated; return validated;
} }
@ -426,7 +426,7 @@ public:
size *= count; size *= count;
if (size.has_overflow()) if (size.has_overflow())
return false; return false;
return validate_write((T*)value.ptr(), size.value()); return validate_write(value, size.value());
} }
template<typename DataType, typename SizeType> 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 [[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; [[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(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 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; KResultOr<String> get_syscall_path_argument(const Syscall::StringArgument&) const;

View file

@ -75,23 +75,23 @@ inline void copy_to_user(T* dest, const T* src)
template<typename T> template<typename T>
inline void copy_from_user(T* dest, Userspace<const T*> src) inline void copy_from_user(T* dest, Userspace<const T*> src)
{ {
copy_from_user(dest, (const T*)src.ptr(), sizeof(T)); copy_from_user(dest, src.unsafe_userspace_ptr(), sizeof(T));
} }
template<typename T> template<typename T>
inline void copy_to_user(Userspace<T*> dest, const T* src) inline void copy_to_user(Userspace<T*> dest, const T* src)
{ {
copy_to_user((T*)dest.ptr(), src, sizeof(T)); copy_to_user(dest.unsafe_userspace_ptr(), src, sizeof(T));
} }
template<typename T> template<typename T>
inline void copy_to_user(Userspace<T*> dest, const void* src, size_t size) inline void copy_to_user(Userspace<T*> dest, const void* src, size_t size)
{ {
copy_to_user((void*)dest.ptr(), src, size); copy_to_user(dest.unsafe_userspace_ptr(), src, size);
} }
template<typename T> template<typename T>
inline void copy_from_user(void* dest, Userspace<const T*> src, size_t size) inline void copy_from_user(void* dest, Userspace<const T*> src, size_t size)
{ {
copy_from_user(dest, (const void*)src.ptr(), size); copy_from_user(dest, src.unsafe_userspace_ptr(), size);
} }

View file

@ -57,7 +57,7 @@ ssize_t Process::sys$read(int fd, Userspace<u8*> buffer, ssize_t size)
} }
} }
// FIXME: We should have a read() that takes a Userspace<u8*> // FIXME: We should have a read() that takes a Userspace<u8*>
return description->read((u8*)buffer.ptr(), size); return description->read(buffer.unsafe_userspace_ptr(), size);
} }
} }