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

sock: sock_copy_addr_to_user

Browse Source
This commit is contained in:
Matheus
2026-07-05 16:16:05 -03:00
parent 4699055cee
commit 7f8fd07f39
6 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/abi.h
+2 -2
View File
@@ -144,12 +144,12 @@ typedef struct {
uint16_t sin_family;
uint16_t sin_port;
uint32_t sin_addr;
} __attribute__((packed)) inaddr_t;
} inaddr_t;
typedef struct {
uint16_t sun_family;
char sun_path[ABISOCKADDR_UN_MAX];
} __attribute__((packed)) unaddr_t;
} unaddr_t;
typedef struct {
void *addr;
kernel-src/include/kernel/sock.h
+39
View File
@@ -193,6 +193,45 @@ static inline int sock_addrtoabiaddr(int socktype, sockaddr_t *sockaddr, abisock
return 0;
}
static inline int sock_copy_addr_to_user(int socktype, sockaddr_t *sockaddr, void *uaddr, socklen_t uaddrlen, socklen_t *actual_len) {
switch (socktype) {
case SOCKET_TYPE_UDP:
case SOCKET_TYPE_TCP: {
abisockaddr_t abisockaddr = {0};
abisockaddr.type = AF_INET;
inaddr_t *inaddr = (inaddr_t *)&abisockaddr;
inaddr->sin_addr = cpu_to_be_d(sockaddr->ipv4addr.addr);
inaddr->sin_port = cpu_to_be_w(sockaddr->ipv4addr.port);
*actual_len = sizeof(abisockaddr);
return usercopy_touser(uaddr, &abisockaddr, min(uaddrlen, sizeof(abisockaddr)));
}
case SOCKET_TYPE_LOCAL:
case SOCKET_TYPE_LOCAL_SEQPACKET: {
size_t path_len = strnlen(sockaddr->path, ABISOCKADDR_UN_MAX - 1) + 1;
if (path_len == ABISOCKADDR_UN_MAX)
return EINVAL;
*actual_len = offsetof(unaddr_t, sun_path) + (path_len != 1 ? path_len : 0);
uint16_t family = AF_LOCAL;
if (usercopy_touser(uaddr, &family, min(uaddrlen, sizeof(family))))
return EFAULT;
if (uaddrlen > offsetof(unaddr_t, sun_path) && path_len) {
size_t size = min(uaddrlen - offsetof(unaddr_t, sun_path), path_len);
if (usercopy_touser((void *)((uintptr_t)uaddr + offsetof(unaddr_t, sun_path)), sockaddr->path, size))
return EFAULT;
}
return 0;
}
default:
return EINVAL;
}
}
static inline int sock_copymsghdr(msghdr_t *khdr, msghdr_t *uhdr) {
if (usercopy_fromuser(khdr, uhdr, sizeof(msghdr_t)))
return EFAULT;
kernel-src/sys/syscalls/accept.c
+13 -7
View File
@@ -69,14 +69,20 @@ syscallret_t syscall_accept(context_t *, int oldfd, abisockaddr_t *abisockaddr,
newfile->offset = 0;
newfile->mode = 0777;
abisockaddr_t tmpabiaddr;
__assert(sock_addrtoabiaddr(client->type, &addr, &tmpabiaddr) == 0);
addrlen = min(addrlen, sizeof(abisockaddr_t));
if (abisockaddr != NULL) {
socklen_t actual_len;
ret.errno = sock_copy_addr_to_user(client->type, &addr, abisockaddr, addrlen, &actual_len);
if (ret.errno) {
fd_close(newfd);
goto cleanup;
}
if (abisockaddr != NULL && (usercopy_touser(abisockaddr, &tmpabiaddr, addrlen) || usercopy_touser(uaddrlen, &addrlen, sizeof(addrlen)))) {
ret.errno = EFAULT;
fd_close(newfd);
goto cleanup;
addrlen = actual_len;
ret.errno = usercopy_touser(uaddrlen, &addrlen, sizeof(addrlen));
if (ret.errno) {
fd_close(newfd);
goto cleanup;
}
}
ret.ret = newfd;
kernel-src/sys/syscalls/getpeername.c
+3 -10
View File
@@ -29,19 +29,12 @@ syscallret_t syscall_getpeername(context_t *, int fd, void *uaddr, int *uaddrlen
if (ret.errno)
goto cleanup;
abisockaddr_t abisockaddr;
ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr);
socklen_t actual_len;
ret.errno = sock_copy_addr_to_user(socket->type, &sockaddr, uaddr, addrlen, &actual_len);
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(uaddr, &abisockaddr, min(addrlen, sizeof(abisockaddr_t)));
if (ret.errno)
goto cleanup;
addrlen = sizeof(abisockaddr_t);
addrlen = actual_len;
ret.errno = usercopy_touser(uaddrlen, &addrlen, sizeof(addrlen));
ret.ret = ret.errno ? -1 : 0;
kernel-src/sys/syscalls/getsockname.c
+4 -8
View File
@@ -11,8 +11,6 @@ syscallret_t syscall_getsockname(context_t *, int fd, void *uaddr, int *uaddrlen
if (ret.errno)
return ret;
addrlen = min(addrlen, sizeof(abisockaddr_t));
file_t *file = fd_get(fd);
if (file == NULL) {
ret.errno = EBADF;
@@ -31,16 +29,14 @@ syscallret_t syscall_getsockname(context_t *, int fd, void *uaddr, int *uaddrlen
if (ret.errno)
goto cleanup;
abisockaddr_t abisockaddr;
printf("namelen: %lu\n", strlen(sockaddr.path));
ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr);
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(uaddr, &abisockaddr, addrlen);
socklen_t actual_len;
ret.errno = sock_copy_addr_to_user(socket->type, &sockaddr, uaddr, addrlen, &actual_len);
if (ret.errno)
goto cleanup;
addrlen = actual_len;
ret.errno = usercopy_touser(uaddrlen, &addrlen, sizeof(addrlen));
if (ret.errno)
goto cleanup;
kernel-src/sys/syscalls/recvmsg.c
+6 -6
View File
@@ -82,17 +82,17 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
goto cleanup;
if (msghdr.addr) {
abisockaddr_t abisockaddr;
ret.errno = sock_addrtoabiaddr(socket->type, &sockaddr, &abisockaddr);
if (ret.errno)
goto cleanup;
void *ptr;
ret.errno = usercopy_fromuser(&ptr, &umsghdr->addr, sizeof(void *));
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(ptr, &abisockaddr, min(sizeof(abisockaddr), msghdr.addrlen));
socklen_t actual_len;
ret.errno = sock_copy_addr_to_user(socket->type, &sockaddr, ptr, msghdr.addrlen, &actual_len);
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(&umsghdr->addrlen, &actual_len, sizeof(actual_len));
if (ret.errno)
goto cleanup;
}