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

syscalls: fix unsafe userspace dereference in getpeername

Browse Source
This commit is contained in:
Matheus
2024-06-27 22:44:45 -03:00
parent 7821eb61c1
commit d8d39a288a
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/syscalls/getpeername.c
+15 -7
View File
@@ -1,11 +1,16 @@
#include <kernel/syscalls.h> #include <kernel/syscalls.h>
#include <kernel/sock.h> #include <kernel/sock.h>
syscallret_t syscall_getpeername(context_t *, int fd, void *uaddr, int *addrlen) { syscallret_t syscall_getpeername(context_t *, int fd, void *uaddr, int *uaddrlen) {
syscallret_t ret = { syscallret_t ret = {
.ret = -1 .ret = -1
}; };
int addrlen;
ret.errno = usercopy_fromuser(&addrlen, uaddrlen, sizeof(addrlen));
if (ret.errno)
return ret;
file_t *file = fd_get(fd); file_t *file = fd_get(fd);
if (file == NULL) { if (file == NULL) {
ret.errno = EBADF; ret.errno = EBADF;
@@ -27,15 +32,18 @@ syscallret_t syscall_getpeername(context_t *, int fd, void *uaddr, int *addrlen)
abisockaddr_t abisockaddr; abisockaddr_t abisockaddr;
ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr); ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr);
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(uaddr, &abisockaddr, min(*addrlen, sizeof(abisockaddr_t)));
if (ret.errno) if (ret.errno)
goto cleanup; goto cleanup;
*addrlen = sizeof(abisockaddr_t); ret.errno = usercopy_touser(uaddr, &abisockaddr, min(addrlen, sizeof(abisockaddr_t)));
ret.ret = 0; if (ret.errno)
goto cleanup;
addrlen = sizeof(abisockaddr_t);
ret.errno = usercopy_touser(uaddrlen, &addrlen, sizeof(addrlen));
ret.ret = ret.errno ? -1 : 0;
cleanup: cleanup:
if (file) if (file)