system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Modernize Error handling when serializing directory entries

Browse source
This commit is contained in:
Tim Schumacher 2023-02-07 12:01:31 +01:00 committed by Linus Groh
parent ccc871e608
commit 23e10a30ad
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Kernel/FileSystem/OpenFileDescription.cpp
View file

@ -220,43 +220,35 @@ ErrorOr<size_t> OpenFileDescription::get_dir_entries(UserOrKernelBuffer& output_
return EIO;
size_t remaining = size;
ErrorOr<void> error;
u8 stack_buffer[PAGE_SIZE];
Bytes temp_buffer(stack_buffer, sizeof(stack_buffer));
DeprecatedOutputMemoryStream stream { temp_buffer };
auto flush_stream_to_output_buffer = [&error, &stream, &remaining, &output_buffer]() -> bool {
if (error.is_error())
return false;
auto flush_stream_to_output_buffer = [&stream, &remaining, &output_buffer]() -> ErrorOr<void> {
if (stream.size() == 0)
return true;
if (remaining < stream.size()) {
error = EINVAL;
return false;
}
if (auto result = output_buffer.write(stream.bytes()); result.is_error()) {
error = result.release_error();
return false;
}
return {};
if (remaining < stream.size())
return Error::from_errno(EINVAL);
TRY(output_buffer.write(stream.bytes()));
output_buffer = output_buffer.offset(stream.size());
remaining -= stream.size();
stream.reset();
return true;
return {};
};
ErrorOr<void> result = VirtualFileSystem::the().traverse_directory_inode(*m_inode, [&flush_stream_to_output_buffer, &error, &stream, this](auto& entry) -> ErrorOr<void> {
ErrorOr<void> result = VirtualFileSystem::the().traverse_directory_inode(*m_inode, [&flush_stream_to_output_buffer, &stream, this](auto& entry) -> ErrorOr<void> {
size_t serialized_size = sizeof(ino_t) + sizeof(u8) + sizeof(size_t) + sizeof(char) * entry.name.length();
if (serialized_size > stream.remaining()) {
if (!flush_stream_to_output_buffer())
return error;
}
if (serialized_size > stream.remaining())
TRY(flush_stream_to_output_buffer());
stream << (u64)entry.inode.index().value();
stream << m_inode->fs().internal_file_type_to_directory_entry_type(entry);
stream << (u32)entry.name.length();
stream << entry.name.bytes();
return {};
});
flush_stream_to_output_buffer();
if (result.is_error()) {
// We should only return EFAULT when the userspace buffer is too small,
@ -266,8 +258,8 @@ ErrorOr<size_t> OpenFileDescription::get_dir_entries(UserOrKernelBuffer& output_
return result.release_error();
}
if (error.is_error())
return error.release_error();
TRY(flush_stream_to_output_buffer());
return size - remaining;
}