diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp index 2454a2f6df..bcc1272897 100644 --- a/Kernel/Net/IPv4Socket.cpp +++ b/Kernel/Net/IPv4Socket.cpp @@ -506,8 +506,6 @@ int IPv4Socket::ioctl(FileDescription&, unsigned request, FlatPtr arg) { REQUIRE_PROMISE(inet); - SmapDisabler disabler; - auto ioctl_route = [request, arg]() { rtentry route; if (!copy_from_user(&route, (rtentry*)arg)) diff --git a/Kernel/Syscalls/debug.cpp b/Kernel/Syscalls/debug.cpp index 8bafe6399d..2753b954e1 100644 --- a/Kernel/Syscalls/debug.cpp +++ b/Kernel/Syscalls/debug.cpp @@ -48,7 +48,6 @@ int Process::sys$dbgputstr(Userspace characters, int length) if (length <= 0) return 0; - SmapDisabler disabler; auto buffer = UserOrKernelBuffer::for_user_buffer(characters, length); if (!buffer.has_value()) return -EFAULT; diff --git a/Kernel/Syscalls/getrandom.cpp b/Kernel/Syscalls/getrandom.cpp index 64555ab30e..37d9374659 100644 --- a/Kernel/Syscalls/getrandom.cpp +++ b/Kernel/Syscalls/getrandom.cpp @@ -39,7 +39,6 @@ ssize_t Process::sys$getrandom(Userspace buffer, size_t buffer_size, [[ma if (buffer_size <= 0) return -EINVAL; - SmapDisabler disabler; auto data_buffer = UserOrKernelBuffer::for_user_buffer(buffer, buffer_size); if (!data_buffer.has_value()) return -EFAULT; diff --git a/Kernel/Syscalls/select.cpp b/Kernel/Syscalls/select.cpp index 515b297ed4..9b6855d7c1 100644 --- a/Kernel/Syscalls/select.cpp +++ b/Kernel/Syscalls/select.cpp @@ -39,7 +39,6 @@ int Process::sys$select(const Syscall::SC_select_params* user_params) REQUIRE_PROMISE(stdio); Syscall::SC_select_params params; - SmapDisabler disabler; if (!copy_from_user(¶ms, user_params)) return -EFAULT; @@ -153,8 +152,6 @@ int Process::sys$poll(Userspace user_params) if (!copy_from_user(¶ms, user_params)) return -EFAULT; - SmapDisabler disabler; - Thread::BlockTimeout timeout; if (params.timeout) { timespec timeout_copy; diff --git a/Kernel/Syscalls/socket.cpp b/Kernel/Syscalls/socket.cpp index 0e596707c0..c5a4f91d5e 100644 --- a/Kernel/Syscalls/socket.cpp +++ b/Kernel/Syscalls/socket.cpp @@ -208,7 +208,6 @@ ssize_t Process::sys$sendmsg(int sockfd, Userspace user_ms auto& socket = *description->socket(); if (socket.is_shut_down_for_writing()) return -EPIPE; - SmapDisabler disabler; auto data_buffer = UserOrKernelBuffer::for_user_buffer((u8*)iovs[0].iov_base, iovs[0].iov_len); if (!data_buffer.has_value()) return -EFAULT; @@ -236,8 +235,6 @@ ssize_t Process::sys$recvmsg(int sockfd, Userspace user_msg, int Userspace user_addr((FlatPtr)msg.msg_name); Userspace user_addr_length(msg.msg_name ? (FlatPtr)&user_msg.unsafe_userspace_ptr()->msg_namelen : 0); - SmapDisabler disabler; - auto description = file_description(sockfd); if (!description) return -EBADF;