RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:07:45 +00:00
Code Issues Activity Actions

AK: Make Vector::try_* functions return ErrorOr<void>

Browse source 
Instead of signalling allocation failure with a bool return value
(false), we now use ErrorOr<void> and return ENOMEM as appropriate.
This allows us to use TRY() and MUST() with Vector. :^)
This commit is contained in:
Andreas Kling 2021-11-10 11:55:37 +01:00
parent cd49f30bea
commit 88b6428c25
16 changed files with 98 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Kernel/Syscalls/execve.cpp
View file

@ -100,15 +100,13 @@ static ErrorOr<FlatPtr> make_userspace_context_for_main_thread([[maybe_unused]]
Vector<FlatPtr> argv_entries;
for (auto& argument : arguments) {
push_string_on_new_stack(argument.view());
if (!argv_entries.try_append(new_sp))
return ENOMEM;
TRY(argv_entries.try_append(new_sp));
}
Vector<FlatPtr> env_entries;
for (auto& variable : environment) {
push_string_on_new_stack(variable.view());
if (!env_entries.try_append(new_sp))
return ENOMEM;
TRY(env_entries.try_append(new_sp));
}
for (auto& value : auxiliary_values) {
@ -810,8 +808,7 @@ ErrorOr<void> Process::exec(NonnullOwnPtr<KString> path, NonnullOwnPtrVector<KSt
auto shebang_words = shebang_result.release_value();
auto shebang_path = TRY(shebang_words.first().try_clone());
arguments.ptr_at(0) = move(path);
if (!arguments.try_prepend(move(shebang_words)))
return ENOMEM;
TRY(arguments.try_prepend(move(shebang_words)));
return exec(move(shebang_path), move(arguments), move(environment), ++recursion_depth);
}
@ -881,13 +878,11 @@ ErrorOr<FlatPtr> Process::sys$execve(Userspace<const Syscall::SC_execve_params*>
if (size.has_overflow())
return EOVERFLOW;
Vector<Syscall::StringArgument, 32> strings;
if (!strings.try_resize(list.length))
return ENOMEM;
TRY(strings.try_resize(list.length));
TRY(copy_from_user(strings.data(), list.strings, size.value()));
for (size_t i = 0; i < list.length; ++i) {
auto string = TRY(try_copy_kstring_from_user(strings[i]));
if (!output.try_append(move(string)))
return ENOMEM;
TRY(output.try_append(move(string)));
}
return {};
};

8
Kernel/Syscalls/purge.cpp
View file

@ -27,8 +27,8 @@ ErrorOr<FlatPtr> Process::sys$purge(int mode)
if (vmobject.is_anonymous()) {
// In the event that the append fails, only attempt to continue
// the purge if we have already appended something successfully.
if (!vmobjects.try_append(static_cast<Memory::AnonymousVMObject&>(vmobject)) && vmobjects.is_empty()) {
result = ENOMEM;
if (auto append_result = vmobjects.try_append(static_cast<Memory::AnonymousVMObject&>(vmobject)); append_result.is_error() && vmobjects.is_empty()) {
result = append_result.release_error();
return IterationDecision::Break;
}
}
@ -50,8 +50,8 @@ ErrorOr<FlatPtr> Process::sys$purge(int mode)
if (vmobject.is_inode()) {
// In the event that the append fails, only attempt to continue
// the purge if we have already appended something successfully.
if (!vmobjects.try_append(static_cast<Memory::InodeVMObject&>(vmobject)) && vmobjects.is_empty()) {
result = ENOMEM;
if (auto append_result = vmobjects.try_append(static_cast<Memory::InodeVMObject&>(vmobject)); append_result.is_error() && vmobjects.is_empty()) {
result = append_result.release_error();
return IterationDecision::Break;
}
}

3
Kernel/Syscalls/read.cpp
View file

@ -50,8 +50,7 @@ ErrorOr<FlatPtr> Process::sys$readv(int fd, Userspace<const struct iovec*> iov,
u64 total_length = 0;
Vector<iovec, 32> vecs;
if (!vecs.try_resize(iov_count))
return ENOMEM;
TRY(vecs.try_resize(iov_count));
TRY(copy_n_from_user(vecs.data(), iov, iov_count));
for (auto& vec : vecs) {
total_length += vec.iov_len;

12
Kernel/Syscalls/select.cpp
View file

@ -72,10 +72,8 @@ ErrorOr<FlatPtr> Process::sys$select(Userspace<const Syscall::SC_select_params*>
continue;
auto description = TRY(fds().open_file_description(fd));
if (!fds_info.try_append({ move(description), block_flags }))
return ENOMEM;
if (!selected_fds.try_append(fd))
return ENOMEM;
TRY(fds_info.try_append({ move(description), block_flags }));
TRY(selected_fds.try_append(fd));
}
if constexpr (IO_DEBUG || POLL_SELECT_DEBUG)
@ -146,8 +144,7 @@ ErrorOr<FlatPtr> Process::sys$poll(Userspace<const Syscall::SC_poll_params*> use
nfds_checked *= params.nfds;
if (nfds_checked.has_overflow())
return EFAULT;
if (!fds_copy.try_resize(params.nfds))
return ENOMEM;
TRY(fds_copy.try_resize(params.nfds));
TRY(copy_from_user(fds_copy.data(), &params.fds[0], nfds_checked.value()));
}
@ -162,8 +159,7 @@ ErrorOr<FlatPtr> Process::sys$poll(Userspace<const Syscall::SC_poll_params*> use
block_flags |= BlockFlags::Write;
if (pfd.events & POLLPRI)
block_flags |= BlockFlags::ReadPriority;
if (!fds_info.try_append({ move(description), block_flags }))
return ENOMEM;
TRY(fds_info.try_append({ move(description), block_flags }));
}
auto current_thread = Thread::current();

6
Kernel/Syscalls/setuid.cpp
View file

@ -169,8 +169,7 @@ ErrorOr<FlatPtr> Process::sys$setgroups(size_t count, Userspace<const gid_t*> us
}
Vector<gid_t> new_extra_gids;
if (!new_extra_gids.try_resize(count))
return ENOMEM;
TRY(new_extra_gids.try_resize(count));
TRY(copy_n_from_user(new_extra_gids.data(), user_gids, count));
HashTable<gid_t> unique_extra_gids;
@ -180,8 +179,7 @@ ErrorOr<FlatPtr> Process::sys$setgroups(size_t count, Userspace<const gid_t*> us
}
ProtectedDataMutationScope scope { *this };
if (!m_protected_values.extra_gids.try_resize(unique_extra_gids.size()))
return ENOMEM;
TRY(m_protected_values.extra_gids.try_resize(unique_extra_gids.size()));
size_t i = 0;
for (auto& extra_gid : unique_extra_gids) {
if (extra_gid == gid())

6
Kernel/Syscalls/socket.cpp
View file

@ -168,8 +168,7 @@ ErrorOr<FlatPtr> Process::sys$sendmsg(int sockfd, Userspace<const struct msghdr*
if (msg.msg_iovlen != 1)
return ENOTSUP; // FIXME: Support this :)
Vector<iovec, 1> iovs;
if (!iovs.try_resize(msg.msg_iovlen))
return ENOMEM;
TRY(iovs.try_resize(msg.msg_iovlen));
TRY(copy_n_from_user(iovs.data(), msg.msg_iov, msg.msg_iovlen));
if (iovs[0].iov_len > NumericLimits<ssize_t>::max())
return EINVAL;
@ -201,8 +200,7 @@ ErrorOr<FlatPtr> Process::sys$recvmsg(int sockfd, Userspace<struct msghdr*> user
if (msg.msg_iovlen != 1)
return ENOTSUP; // FIXME: Support this :)
Vector<iovec, 1> iovs;
if (!iovs.try_resize(msg.msg_iovlen))
return ENOMEM;
TRY(iovs.try_resize(msg.msg_iovlen));
TRY(copy_n_from_user(iovs.data(), msg.msg_iov, msg.msg_iovlen));
Userspace<sockaddr*> user_addr((FlatPtr)msg.msg_name);

3
Kernel/Syscalls/write.cpp
View file

@ -24,8 +24,7 @@ ErrorOr<FlatPtr> Process::sys$writev(int fd, Userspace<const struct iovec*> iov,
u64 total_length = 0;
Vector<iovec, 32> vecs;
if (!vecs.try_resize(iov_count))
return ENOMEM;
TRY(vecs.try_resize(iov_count));
TRY(copy_n_from_user(vecs.data(), iov, iov_count));
for (auto& vec : vecs) {
total_length += vec.iov_len;