pread/pwrite: pass buffer directly

This commit is contained in:
Matheus
2024-09-21 17:48:02 -03:00
parent 304538b1b2
commit 710aae754e
2 changed files with 4 additions and 22 deletions
+3 -10
View File
@@ -10,12 +10,6 @@ syscallret_t syscall_pread(context_t *context, int fd, void *buffer, size_t size
.ret = -1
};
void *kernelbuff = vmm_map(NULL, size, VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
if (kernelbuff == NULL) {
ret.errno = ENOMEM;
return ret;
}
file_t *file = fd_get(fd);
if (file == NULL || (file->flags & FILE_READ) == 0) {
@@ -36,17 +30,16 @@ syscallret_t syscall_pread(context_t *context, int fd, void *buffer, size_t size
}
size_t bytesread;
ret.errno = vfs_read(file->vnode, kernelbuff, size, offset, &bytesread, fileflagstovnodeflags(file->flags));
ret.errno = vfs_read(file->vnode, buffer, size, offset, &bytesread, fileflagstovnodeflags(file->flags));
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(buffer, kernelbuff, bytesread);
ret.ret = ret.errno ? -1 : bytesread;
ret.errno = 0;
ret.ret = bytesread;
cleanup:
if (file)
fd_release(file);
vmm_unmap(kernelbuff, size, 0);
return ret;
}