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

recvmsg: fix return of ctrl length and flags

Browse Source
This commit is contained in:
Matheus
2024-09-19 17:24:34 -03:00
parent 87ef9ba76b
commit 9015014804
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/syscalls/recvmsg.c
+9 -3
View File
@@ -70,9 +70,6 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
if (ret.errno) if (ret.errno)
goto cleanup; goto cleanup;
msghdr.ctrllen = desc.ctrldone;
msghdr.flags = (desc.flags & SOCKET_RECV_FLAGS_CTRLTRUNCATED) ? MSG_CTRUNC : 0;
uintmax_t iovoffset = 0; uintmax_t iovoffset = 0;
for (int i = 0; i < msghdr.iovcount; ++i) { for (int i = 0; i < msghdr.iovcount; ++i) {
ret.errno = usercopy_touser(msghdr.iov[i].addr, (void *)((uintptr_t)buffer + iovoffset), msghdr.iov[i].len); ret.errno = usercopy_touser(msghdr.iov[i].addr, (void *)((uintptr_t)buffer + iovoffset), msghdr.iov[i].len);
@@ -103,11 +100,20 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
if (ret.errno) if (ret.errno)
goto cleanup; goto cleanup;
ret.errno = usercopy_touser(&umsghdr->ctrllen, &desc.ctrldone, sizeof(desc.ctrldone));
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(ptr, msghdr.msgctrl, desc.ctrldone); ret.errno = usercopy_touser(ptr, msghdr.msgctrl, desc.ctrldone);
if (ret.errno) if (ret.errno)
goto cleanup; goto cleanup;
} }
if (ret.errno == 0) {
int return_flags = (desc.flags & SOCKET_RECV_FLAGS_CTRLTRUNCATED) ? MSG_CTRUNC : 0;
ret.errno = usercopy_touser(&umsghdr->flags, &return_flags, sizeof(return_flags));
}
ret.ret = ret.errno ? -1 : desc.donecount; ret.ret = ret.errno ? -1 : desc.donecount;
cleanup: cleanup: