RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 21:07:34 +00:00
Code Issues Activity Actions

Kernel: Remove SmapDisabler in sys$setsockopt()

Browse source
This commit is contained in:
Andreas Kling 2020-07-31 00:26:33 +02:00
parent 292cd53192
commit 3023a89e9b
3 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/Net/IPv4Socket.cpp
View file

@ -428,19 +428,23 @@ String IPv4Socket::absolute_path(const FileDescription&) const
return builder.to_string(); return builder.to_string();
} }
KResult IPv4Socket::setsockopt(int level, int option, const void* value, socklen_t value_size) KResult IPv4Socket::setsockopt(int level, int option, const void* user_value, socklen_t user_value_size)
{ {
if (level != IPPROTO_IP) if (level != IPPROTO_IP)
return Socket::setsockopt(level, option, value, value_size); return Socket::setsockopt(level, option, user_value, user_value_size);
switch (option) { switch (option) {
case IP_TTL: case IP_TTL: {
if (value_size < sizeof(int)) if (user_value_size < sizeof(int))
return KResult(-EINVAL); return KResult(-EINVAL);
if (*(const int*)value < 0 || *(const int*)value > 255) int value;
if (!Process::current()->validate_read_and_copy_typed(&value, (const int*)user_value))
return KResult(-EFAULT);
if (value < 0 || value > 255)
return KResult(-EINVAL); return KResult(-EINVAL);
m_ttl = (u8) * (const int*)value; m_ttl = value;
return KSuccess; return KSuccess;
}
default: default:
return KResult(-ENOPROTOOPT); return KResult(-ENOPROTOOPT);
} }

16
Kernel/Net/Socket.cpp
View file

@ -101,24 +101,26 @@ KResult Socket::queue_connection_from(NonnullRefPtr<Socket> peer)
return KSuccess; return KSuccess;
} }
KResult Socket::setsockopt(int level, int option, const void* value, socklen_t value_size) KResult Socket::setsockopt(int level, int option, const void* user_value, socklen_t user_value_size)
{ {
ASSERT(level == SOL_SOCKET); ASSERT(level == SOL_SOCKET);
switch (option) { switch (option) {
case SO_SNDTIMEO: case SO_SNDTIMEO:
if (value_size != sizeof(timeval)) if (user_value_size != sizeof(timeval))
return KResult(-EINVAL); return KResult(-EINVAL);
m_send_timeout = *(const timeval*)value; copy_from_user(&m_send_timeout, (const timeval*)user_value);
return KSuccess; return KSuccess;
case SO_RCVTIMEO: case SO_RCVTIMEO:
if (value_size != sizeof(timeval)) if (user_value_size != sizeof(timeval))
return KResult(-EINVAL); return KResult(-EINVAL);
m_receive_timeout = *(const timeval*)value; copy_from_user(&m_receive_timeout, (const timeval*)user_value);
return KSuccess; return KSuccess;
case SO_BINDTODEVICE: { case SO_BINDTODEVICE: {
if (value_size != IFNAMSIZ) if (user_value_size != IFNAMSIZ)
return KResult(-EINVAL); return KResult(-EINVAL);
StringView ifname { (const char*)value }; auto ifname = Process::current()->validate_and_copy_string_from_user((const char*)user_value, user_value_size);
if (ifname.is_null())
return KResult(-EFAULT);
auto device = NetworkAdapter::lookup_by_name(ifname); auto device = NetworkAdapter::lookup_by_name(ifname);
if (!device) if (!device)
return KResult(-ENODEV); return KResult(-ENODEV);

20
Kernel/Syscalls/socket.cpp
View file

@ -317,29 +317,21 @@ int Process::sys$getsockopt(const Syscall::SC_getsockopt_params* params)
return socket.getsockopt(*description, level, option, value, value_size); return socket.getsockopt(*description, level, option, value, value_size);
} }
int Process::sys$setsockopt(const Syscall::SC_setsockopt_params* params) int Process::sys$setsockopt(const Syscall::SC_setsockopt_params* user_params)
{ {
if (!validate_read_typed(params)) Syscall::SC_setsockopt_params params;
if (!validate_read_and_copy_typed(&params, user_params))
return -EFAULT; return -EFAULT;
if (!validate_read(params.value, params.value_size))
SmapDisabler disabler;
int sockfd = params->sockfd;
int level = params->level;
int option = params->option;
const void* value = params->value;
socklen_t value_size = params->value_size;
if (!validate_read(value, value_size))
return -EFAULT; return -EFAULT;
auto description = file_description(sockfd); auto description = file_description(params.sockfd);
if (!description) if (!description)
return -EBADF; return -EBADF;
if (!description->is_socket()) if (!description->is_socket())
return -ENOTSOCK; return -ENOTSOCK;
auto& socket = *description->socket(); auto& socket = *description->socket();
REQUIRE_PROMISE_FOR_SOCKET_DOMAIN(socket.domain()); REQUIRE_PROMISE_FOR_SOCKET_DOMAIN(socket.domain());
return socket.setsockopt(level, option, value, value_size); return socket.setsockopt(params.level, params.option, params.value, params.value_size);
} }
} }