|
@@ -30,6 +30,64 @@
|
|
|
|
|
|
namespace Kernel {
|
|
namespace Kernel {
|
|
|
|
|
|
|
|
+ssize_t Process::sys$readv(int fd, Userspace<const struct iovec*> iov, int iov_count)
|
|
|
|
+{
|
|
|
|
+ REQUIRE_PROMISE(stdio);
|
|
|
|
+ if (iov_count < 0)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
|
|
+ {
|
|
|
|
+ Checked checked_iov_count = sizeof(iovec);
|
|
|
|
+ checked_iov_count *= iov_count;
|
|
|
|
+ if (checked_iov_count.has_overflow())
|
|
|
|
+ return -EFAULT;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ u64 total_length = 0;
|
|
|
|
+ Vector<iovec, 32> vecs;
|
|
|
|
+ vecs.resize(iov_count);
|
|
|
|
+ if (!copy_n_from_user(vecs.data(), iov, iov_count))
|
|
|
|
+ return -EFAULT;
|
|
|
|
+ for (auto& vec : vecs) {
|
|
|
|
+ total_length += vec.iov_len;
|
|
|
|
+ if (total_length > NumericLimits<i32>::max())
|
|
|
|
+ return -EINVAL;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ auto description = file_description(fd);
|
|
|
|
+ if (!description)
|
|
|
|
+ return -EBADF;
|
|
|
|
+
|
|
|
|
+ if (!description->is_readable())
|
|
|
|
+ return -EBADF;
|
|
|
|
+
|
|
|
|
+ if (description->is_directory())
|
|
|
|
+ return -EISDIR;
|
|
|
|
+
|
|
|
|
+ int nread = 0;
|
|
|
|
+ for (auto& vec : vecs) {
|
|
|
|
+ if (description->is_blocking()) {
|
|
|
|
+ if (!description->can_read()) {
|
|
|
|
+ auto unblock_flags = Thread::FileBlocker::BlockFlags::None;
|
|
|
|
+ if (Thread::current()->block<Thread::ReadBlocker>({}, *description, unblock_flags).was_interrupted())
|
|
|
|
+ return -EINTR;
|
|
|
|
+ if (!((u32)unblock_flags & (u32)Thread::FileBlocker::BlockFlags::Read))
|
|
|
|
+ return -EAGAIN;
|
|
|
|
+ // TODO: handle exceptions in unblock_flags
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ auto buffer = UserOrKernelBuffer::for_user_buffer((u8*)vec.iov_base, vec.iov_len);
|
|
|
|
+ if (!buffer.has_value())
|
|
|
|
+ return -EFAULT;
|
|
|
|
+ auto result = description->read(buffer.value(), vec.iov_len);
|
|
|
|
+ if (result.is_error())
|
|
|
|
+ return result.error();
|
|
|
|
+ nread += result.value();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return nread;
|
|
|
|
+}
|
|
|
|
+
|
|
ssize_t Process::sys$read(int fd, Userspace<u8*> buffer, ssize_t size)
|
|
ssize_t Process::sys$read(int fd, Userspace<u8*> buffer, ssize_t size)
|
|
{
|
|
{
|
|
REQUIRE_PROMISE(stdio);
|
|
REQUIRE_PROMISE(stdio);
|