RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:27:35 +00:00
Code Issues Activity Actions

Kernel: Allow sys$accept(address = nullptr)

Browse source
This commit is contained in:
Sergey Bugaev 2020-06-08 21:42:48 +03:00 • committed by Andreas Kling
parent 33d6d640d3
commit 31b025fcfc
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Kernel/Process.cpp
View file

@ -3304,12 +3304,16 @@ int Process::sys$listen(int sockfd, int backlog)
int Process::sys$accept(int accepting_socket_fd, sockaddr* user_address, socklen_t* user_address_size) int Process::sys$accept(int accepting_socket_fd, sockaddr* user_address, socklen_t* user_address_size)
{ {
REQUIRE_PROMISE(accept); REQUIRE_PROMISE(accept);
if (!validate_write_typed(user_address_size))
return -EFAULT;
socklen_t address_size = 0; socklen_t address_size = 0;
copy_from_user(&address_size, user_address_size); if (user_address) {
if (!validate_write(user_address, address_size)) if (!validate_write_typed(user_address_size))
return -EFAULT; return -EFAULT;
copy_from_user(&address_size, user_address_size);
if (!validate_write(user_address, address_size))
return -EFAULT;
}
int accepted_socket_fd = alloc_fd(); int accepted_socket_fd = alloc_fd();
if (accepted_socket_fd < 0) if (accepted_socket_fd < 0)
return accepted_socket_fd; return accepted_socket_fd;
@ -3319,6 +3323,7 @@ int Process::sys$accept(int accepting_socket_fd, sockaddr* user_address, socklen
if (!accepting_socket_description->is_socket()) if (!accepting_socket_description->is_socket())
return -ENOTSOCK; return -ENOTSOCK;
auto& socket = *accepting_socket_description->socket(); auto& socket = *accepting_socket_description->socket();
if (!socket.can_accept()) { if (!socket.can_accept()) {
if (accepting_socket_description->is_blocking()) { if (accepting_socket_description->is_blocking()) {
if (Thread::current->block<Thread::AcceptBlocker>(*accepting_socket_description) != Thread::BlockResult::WokeNormally) if (Thread::current->block<Thread::AcceptBlocker>(*accepting_socket_description) != Thread::BlockResult::WokeNormally)
@ -3330,11 +3335,13 @@ int Process::sys$accept(int accepting_socket_fd, sockaddr* user_address, socklen
auto accepted_socket = socket.accept(); auto accepted_socket = socket.accept();
ASSERT(accepted_socket); ASSERT(accepted_socket);
u8 address_buffer[sizeof(sockaddr_un)]; if (user_address) {
address_size = min(sizeof(sockaddr_un), static_cast<size_t>(address_size)); u8 address_buffer[sizeof(sockaddr_un)];
accepted_socket->get_peer_address((sockaddr*)address_buffer, &address_size); address_size = min(sizeof(sockaddr_un), static_cast<size_t>(address_size));
copy_to_user(user_address, address_buffer, address_size); accepted_socket->get_peer_address((sockaddr*)address_buffer, &address_size);
copy_to_user(user_address_size, &address_size); copy_to_user(user_address, address_buffer, address_size);
copy_to_user(user_address_size, &address_size);
}
auto accepted_socket_description = FileDescription::create(*accepted_socket); auto accepted_socket_description = FileDescription::create(*accepted_socket);
accepted_socket_description->set_readable(true); accepted_socket_description->set_readable(true);