mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-30 05:58:22 +00:00
read/write: dont copy to a buffer
This commit is contained in:
@@ -8,9 +8,8 @@ syscallret_t syscall_write(context_t *context, int fd, void *buffer, size_t size
|
||||
.ret = -1
|
||||
};
|
||||
|
||||
void *kernelbuff = vmm_map(NULL, size == 0 ? 1 : size, VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
|
||||
if (kernelbuff == NULL) {
|
||||
ret.errno = ENOMEM;
|
||||
if (IS_USER_ADDRESS(buffer) == false) {
|
||||
ret.errno = EFAULT;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -21,10 +20,6 @@ syscallret_t syscall_write(context_t *context, int fd, void *buffer, size_t size
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
ret.errno = usercopy_fromuser(kernelbuff, buffer, size);
|
||||
if (ret.errno)
|
||||
goto cleanup;
|
||||
|
||||
if (size == 0) {
|
||||
ret.ret = 0;
|
||||
ret.errno = 0;
|
||||
@@ -46,7 +41,7 @@ syscallret_t syscall_write(context_t *context, int fd, void *buffer, size_t size
|
||||
offset = attr.size;
|
||||
}
|
||||
|
||||
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)
|
||||
goto cleanup;
|
||||
@@ -58,6 +53,5 @@ cleanup:
|
||||
if (file)
|
||||
fd_release(file);
|
||||
|
||||
vmm_unmap(kernelbuff, size == 0 ? 1 : size, 0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user