DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use macro expansion for maximum sockaddr storage length rather than hardcoded value

Browse Source
This commit is contained in:
Andrea Ciliberti 2024-09-09 15:19:50 +02:00 committed by fincs
parent 30dc65121d
commit 04b9418dd9
9 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libctru/source/services/soc/soc_accept.c
View File

@ -6,10 +6,10 @@
int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
{ {
int ret = 0; int ret = 0;
int tmp_addrlen = 0x1c; int tmp_addrlen = ADDR_STORAGE_LEN;
int fd, dev; int fd, dev;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
u32 saved_threadstorage[2]; u32 saved_threadstorage[2];
sockfd = soc_get_fd(sockfd); sockfd = soc_get_fd(sockfd);
@ -27,7 +27,7 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
fd = __alloc_handle(dev); fd = __alloc_handle(dev);
if(fd < 0) return fd; if(fd < 0) return fd;
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
cmdbuf[0] = IPC_MakeHeader(0x4,2,2); // 0x40082 cmdbuf[0] = IPC_MakeHeader(0x4,2,2); // 0x40082
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;

6
libctru/source/services/soc/soc_bind.c
View File

@ -8,7 +8,7 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
int ret = 0; int ret = 0;
int tmp_addrlen = 0; int tmp_addrlen = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
sockfd = soc_get_fd(sockfd); sockfd = soc_get_fd(sockfd);
if(sockfd < 0) { if(sockfd < 0) {
@ -16,12 +16,12 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
return -1; return -1;
} }
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
if(addr->sa_family == AF_INET) if(addr->sa_family == AF_INET)
tmp_addrlen = 8; tmp_addrlen = 8;
else else
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
if(addrlen < tmp_addrlen) { if(addrlen < tmp_addrlen) {
errno = EINVAL; errno = EINVAL;

1
libctru/source/services/soc/soc_common.h
View File

@ -10,6 +10,7 @@
#include <3ds/services/soc.h> #include <3ds/services/soc.h>
#define SYNC_ERROR ENODEV #define SYNC_ERROR ENODEV
#define ADDR_STORAGE_LEN sizeof(struct sockaddr_storage)
extern Handle SOCU_handle; extern Handle SOCU_handle;
extern Handle socMemhandle; extern Handle socMemhandle;

6
libctru/source/services/soc/soc_connect.c
View File

@ -8,7 +8,7 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
int ret = 0; int ret = 0;
int tmp_addrlen = 0; int tmp_addrlen = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
sockfd = soc_get_fd(sockfd); sockfd = soc_get_fd(sockfd);
if(sockfd < 0) { if(sockfd < 0) {
@ -16,12 +16,12 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
return -1; return -1;
} }
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
if(addr->sa_family == AF_INET) if(addr->sa_family == AF_INET)
tmp_addrlen = 8; tmp_addrlen = 8;
else else
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
if(addrlen < tmp_addrlen) { if(addrlen < tmp_addrlen) {
errno = EINVAL; errno = EINVAL;

4
libctru/source/services/soc/soc_getnameinfo.c
View File

@ -8,7 +8,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_
int i,tmp_addrlen; int i,tmp_addrlen;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 saved_threadstorage[4]; u32 saved_threadstorage[4];
u8 tmpaddr[0x1c]; // sockaddr size for the kernel is 0x1C (sockaddr_in6?) u8 tmpaddr[ADDR_STORAGE_LEN]; // sockaddr size for the kernel is 0x1C (sockaddr_in6?)
if((host == NULL || hostlen == 0) && (serv == NULL || servlen == 0)) if((host == NULL || hostlen == 0) && (serv == NULL || servlen == 0))
{ {
@ -18,7 +18,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_
if(sa->sa_family == AF_INET) if(sa->sa_family == AF_INET)
tmp_addrlen = 8; tmp_addrlen = 8;
else else
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
if(salen < tmp_addrlen) { if(salen < tmp_addrlen) {
errno = EINVAL; errno = EINVAL;

6
libctru/source/services/soc/soc_getpeername.c
View File

@ -8,7 +8,7 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
int ret = 0; int ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 saved_threadstorage[2]; u32 saved_threadstorage[2];
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
sockfd = soc_get_fd(sockfd); sockfd = soc_get_fd(sockfd);
if(sockfd < 0) { if(sockfd < 0) {
@ -18,14 +18,14 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
cmdbuf[0] = IPC_MakeHeader(0x18,2,2); // 0x180082 cmdbuf[0] = IPC_MakeHeader(0x18,2,2); // 0x180082
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;
cmdbuf[2] = 0x1c; cmdbuf[2] = ADDR_STORAGE_LEN;
cmdbuf[3] = IPC_Desc_CurProcessId(); cmdbuf[3] = IPC_Desc_CurProcessId();
u32 * staticbufs = getThreadStaticBuffers(); u32 * staticbufs = getThreadStaticBuffers();
saved_threadstorage[0] = staticbufs[0]; saved_threadstorage[0] = staticbufs[0];
saved_threadstorage[1] = staticbufs[1]; saved_threadstorage[1] = staticbufs[1];
staticbufs[0] = IPC_Desc_StaticBuffer(0x1c,0); staticbufs[0] = IPC_Desc_StaticBuffer(ADDR_STORAGE_LEN,0);
staticbufs[1] = (u32)tmpaddr; staticbufs[1] = (u32)tmpaddr;
ret = svcSendSyncRequest(SOCU_handle); ret = svcSendSyncRequest(SOCU_handle);

6
libctru/source/services/soc/soc_getsockname.c
View File

@ -8,7 +8,7 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
int ret = 0; int ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 saved_threadstorage[2]; u32 saved_threadstorage[2];
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
sockfd = soc_get_fd(sockfd); sockfd = soc_get_fd(sockfd);
if(sockfd < 0) { if(sockfd < 0) {
@ -18,14 +18,14 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
cmdbuf[0] = IPC_MakeHeader(0x17,2,2); // 0x170082 cmdbuf[0] = IPC_MakeHeader(0x17,2,2); // 0x170082
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;
cmdbuf[2] = 0x1c; cmdbuf[2] = ADDR_STORAGE_LEN;
cmdbuf[3] = IPC_Desc_CurProcessId(); cmdbuf[3] = IPC_Desc_CurProcessId();
u32 * staticbufs = getThreadStaticBuffers(); u32 * staticbufs = getThreadStaticBuffers();
saved_threadstorage[0] = staticbufs[0]; saved_threadstorage[0] = staticbufs[0];
saved_threadstorage[1] = staticbufs[1]; saved_threadstorage[1] = staticbufs[1];
staticbufs[0] = IPC_Desc_StaticBuffer(0x1c,0); staticbufs[0] = IPC_Desc_StaticBuffer(ADDR_STORAGE_LEN,0);
staticbufs[1] = (u32)tmpaddr; staticbufs[1] = (u32)tmpaddr;
ret = svcSendSyncRequest(SOCU_handle); ret = svcSendSyncRequest(SOCU_handle);

12
libctru/source/services/soc/soc_recvfrom.c
View File

@ -8,13 +8,13 @@ ssize_t socuipc_cmd7(int sockfd, void *buf, size_t len, int flags, struct sockad
int ret = 0; int ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 tmp_addrlen = 0; u32 tmp_addrlen = 0;
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
u32 saved_threadstorage[2]; u32 saved_threadstorage[2];
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
if(src_addr) if(src_addr)
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
cmdbuf[0] = IPC_MakeHeader(0x7,4,4); // 0x70104 cmdbuf[0] = IPC_MakeHeader(0x7,4,4); // 0x70104
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;
@ -66,13 +66,13 @@ ssize_t socuipc_cmd8(int sockfd, void *buf, size_t len, int flags, struct sockad
int ret = 0; int ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 tmp_addrlen = 0; u32 tmp_addrlen = 0;
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
u32 saved_threadstorage[4]; u32 saved_threadstorage[4];
if(src_addr) if(src_addr)
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
cmdbuf[0] = 0x00080102; cmdbuf[0] = 0x00080102;
cmdbuf[1] = (u32)sockfd; cmdbuf[1] = (u32)sockfd;

12
libctru/source/services/soc/soc_sendto.c
View File

@ -8,15 +8,15 @@ ssize_t socuipc_cmd9(int sockfd, const void *buf, size_t len, int flags, const s
int ret = 0; int ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 tmp_addrlen = 0; u32 tmp_addrlen = 0;
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
if(dest_addr) { if(dest_addr) {
if(dest_addr->sa_family == AF_INET) if(dest_addr->sa_family == AF_INET)
tmp_addrlen = 8; tmp_addrlen = 8;
else else
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
if(addrlen < tmp_addrlen) { if(addrlen < tmp_addrlen) {
errno = EINVAL; errno = EINVAL;
@ -62,15 +62,15 @@ ssize_t socuipc_cmda(int sockfd, const void *buf, size_t len, int flags, const s
int ret = 0; int ret = 0;
u32 *cmdbuf = getThreadCommandBuffer(); u32 *cmdbuf = getThreadCommandBuffer();
u32 tmp_addrlen = 0; u32 tmp_addrlen = 0;
u8 tmpaddr[0x1c]; u8 tmpaddr[ADDR_STORAGE_LEN];
memset(tmpaddr, 0, 0x1c); memset(tmpaddr, 0, ADDR_STORAGE_LEN);
if(dest_addr) { if(dest_addr) {
if(dest_addr->sa_family == AF_INET) if(dest_addr->sa_family == AF_INET)
tmp_addrlen = 8; tmp_addrlen = 8;
else else
tmp_addrlen = 0x1c; tmp_addrlen = ADDR_STORAGE_LEN;
if(addrlen < tmp_addrlen) { if(addrlen < tmp_addrlen) {
errno = EINVAL; errno = EINVAL;