0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Kernel: Use static_ptr_cast to convert between Userspace<T*> types

Browse source 
Some calls of copy_to_user were converting Userspace<T*> to
Userspace<U*> via the implicit conversion to FlatPtr. Change them to use
the static_ptr_cast overload that is designed to express this conversion
This commit is contained in:
Andrew Kaster 2021-11-14 15:43:43 -07:00 • committed by Andreas Kling
parent 194456efdc
commit 7243bcb7da
Notes: sideshowbarker 2024-07-18 01:05:50 +09:00
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/FileSystem/InodeFile.cpp
View file

@ -74,7 +74,7 @@ ErrorOr<void> InodeFile::ioctl(OpenFileDescription& description, unsigned reques
}
case FIONREAD: {
int remaining_bytes = inode().size() - description.offset();
return copy_to_user(Userspace<int*>(arg), &remaining_bytes);
return copy_to_user(static_ptr_cast<int*>(arg), &remaining_bytes);
}
default:
return EINVAL;

2
Kernel/Net/IPv4Socket.cpp
View file

@ -763,7 +763,7 @@ ErrorOr<void> IPv4Socket::ioctl(OpenFileDescription&, unsigned request, Userspac
case FIONREAD: {
int readable = m_receive_buffer->immediately_readable();
return copy_to_user(Userspace<int*>(arg), &readable);
return copy_to_user(static_ptr_cast<int*>(arg), &readable);
}
}

2
Kernel/Net/LocalSocket.cpp
View file

@ -425,7 +425,7 @@ ErrorOr<void> LocalSocket::ioctl(OpenFileDescription& description, unsigned requ
switch (request) {
case FIONREAD: {
int readable = receive_buffer_for(description)->immediately_readable();
return copy_to_user(Userspace<int*>(arg), &readable);
return copy_to_user(static_ptr_cast<int*>(arg), &readable);
}
}

4
Kernel/Storage/StorageDevice.cpp
View file

@ -193,12 +193,12 @@ ErrorOr<void> StorageDevice::ioctl(OpenFileDescription&, unsigned request, Users
switch (request) {
case STORAGE_DEVICE_GET_SIZE: {
size_t disk_size = m_max_addressable_block * block_size();
return copy_to_user(Userspace<size_t*>(arg), &disk_size);
return copy_to_user(static_ptr_cast<size_t*>(arg), &disk_size);
break;
}
case STORAGE_DEVICE_GET_BLOCK_SIZE: {
size_t size = block_size();
return copy_to_user(Userspace<size_t*>(arg), &size);
return copy_to_user(static_ptr_cast<size_t*>(arg), &size);
break;
}
default: