mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-02 07:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

pread/pwrite: pass buffer directly

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/syscalls/pread.c
+3 -10
View File
@@ -10,12 +10,6 @@ syscallret_t syscall_pread(context_t *context, int fd, void *buffer, size_t size
.ret = -1 .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); file_t *file = fd_get(fd);
if (file == NULL || (file->flags & FILE_READ) == 0) { 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; 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) if (ret.errno)
goto cleanup; goto cleanup;
ret.errno = usercopy_touser(buffer, kernelbuff, bytesread); ret.errno = 0;
ret.ret = ret.errno ? -1 : bytesread; ret.ret = bytesread;
cleanup: cleanup:
if (file) if (file)
fd_release(file); fd_release(file);
vmm_unmap(kernelbuff, size, 0);
return ret; return ret;
} }
kernel-src/sys/syscalls/pwrite.c
+1 -12
View File
@@ -8,12 +8,6 @@ syscallret_t syscall_pwrite(context_t *context, int fd, void *buffer, size_t siz
.ret = -1 .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); file_t *file = fd_get(fd);
if (file == NULL || (file->flags & FILE_WRITE) == 0) { if (file == NULL || (file->flags & FILE_WRITE) == 0) {
@@ -27,10 +21,6 @@ syscallret_t syscall_pwrite(context_t *context, int fd, void *buffer, size_t siz
goto cleanup; goto cleanup;
} }
ret.errno = usercopy_fromuser(kernelbuff, buffer, size);
if (ret.errno)
goto cleanup;
size_t tmp; size_t tmp;
if (file->vnode->type == V_TYPE_SOCKET || file->vnode->type == V_TYPE_FIFO || (file->vnode->type == V_TYPE_CHDEV && VOP_MAXSEEK(file->vnode, &tmp))) { if (file->vnode->type == V_TYPE_SOCKET || file->vnode->type == V_TYPE_FIFO || (file->vnode->type == V_TYPE_CHDEV && VOP_MAXSEEK(file->vnode, &tmp))) {
ret.errno = ESPIPE; ret.errno = ESPIPE;
@@ -38,7 +28,7 @@ syscallret_t syscall_pwrite(context_t *context, int fd, void *buffer, size_t siz
} }
size_t byteswritten; size_t byteswritten;
ret.errno = vfs_write(file->vnode, kernelbuff, size, offset, &byteswritten, fileflagstovnodeflags(file->flags)); ret.errno = vfs_write(file->vnode, buffer, size, offset, &byteswritten, fileflagstovnodeflags(file->flags));
if (ret.errno) if (ret.errno)
goto cleanup; goto cleanup;
@@ -49,6 +39,5 @@ cleanup:
if (file) if (file)
fd_release(file); fd_release(file);
vmm_unmap(kernelbuff, size, 0);
return ret; return ret;
} }