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

Kernel: Remove SmapDisabler in sys$connect()

Browse source
This commit is contained in:
Andreas Kling 2020-02-28 13:20:26 +01:00
parent 6321b6ecc0
commit b0623a0c58
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Process.cpp
View file

@ -3280,9 +3280,9 @@ int Process::sys$accept(int accepting_socket_fd, sockaddr* user_address, socklen
return accepted_socket_fd; return accepted_socket_fd;
} }
int Process::sys$connect(int sockfd, const sockaddr* address, socklen_t address_size) int Process::sys$connect(int sockfd, const sockaddr* user_address, socklen_t user_address_size)
{ {
if (!validate_read(address, address_size)) if (!validate_read(user_address, user_address_size))
return -EFAULT; return -EFAULT;
int fd = alloc_fd(); int fd = alloc_fd();
if (fd < 0) if (fd < 0)
@ -3295,8 +3295,12 @@ int Process::sys$connect(int sockfd, const sockaddr* address, socklen_t address_
auto& socket = *description->socket(); auto& socket = *description->socket();
REQUIRE_PROMISE_FOR_SOCKET_DOMAIN(socket.domain()); REQUIRE_PROMISE_FOR_SOCKET_DOMAIN(socket.domain());
SmapDisabler disabler;
return socket.connect(*description, address, address_size, description->is_blocking() ? ShouldBlock::Yes : ShouldBlock::No); u8 address[sizeof(sockaddr_un)];
size_t address_size = min(sizeof(address), static_cast<size_t>(user_address_size));
copy_from_user(address, user_address, address_size);
return socket.connect(*description, (const sockaddr*)address, address_size, description->is_blocking() ? ShouldBlock::Yes : ShouldBlock::No);
} }
int Process::sys$shutdown(int sockfd, int how) int Process::sys$shutdown(int sockfd, int how)