libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-27 23:57:06 +08:00
Code Issues Releases Wiki Activity

[AF_UNIX] Update AF_UNIX bind, connect entry (#8314)

Browse Source
This commit is contained in:
rcitachi 2023-12-02 12:11:01 +08:00 committed by GitHub
parent d1a1a42ef5
commit 58665c7f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
components/lwp/lwp_syscall.c
View File

@ -3290,26 +3290,37 @@ sysret_t sys_accept(int socket, struct musl_sockaddr *addr, socklen_t *addrlen)
sysret_t sys_bind(int socket, const struct musl_sockaddr *name, socklen_t namelen) sysret_t sys_bind(int socket, const struct musl_sockaddr *name, socklen_t namelen)
{ {
rt_err_t ret = 0;
struct sockaddr sa; struct sockaddr sa;
struct musl_sockaddr kname; struct musl_sockaddr kname;
struct sockaddr_un addr_un;
rt_uint16_t family = 0;
if (!lwp_user_accessable((void *)name, namelen)) if (!lwp_user_accessable((void *)name, namelen))
{ {
return -EFAULT; return -EFAULT;
} }
#ifdef SAL_USING_AF_UNIX lwp_get_from_user(&family, (void *)name, 2);
if (name->sa_family == AF_UNIX) if (family == AF_UNIX)
{ {
namelen = sizeof(struct sockaddr); if (!lwp_user_accessable((void *)name, sizeof(struct sockaddr_un)))
{
return -EFAULT;
}
lwp_get_from_user(&addr_un, (void *)name, sizeof(struct sockaddr_un));
ret = bind(socket, (struct sockaddr *)(&addr_un), namelen);
}
else
{
lwp_get_from_user(&kname, (void *)name, namelen);
sockaddr_tolwip(&kname, &sa);
ret = bind(socket, &sa, namelen);
} }
#endif /* SAL_USING_AF_UNIX */
lwp_get_from_user(&kname, (void *)name, namelen); return (ret < 0 ? GET_ERRNO() : ret);
sockaddr_tolwip(&kname, &sa);
return bind(socket, &sa, namelen);
} }
sysret_t sys_shutdown(int socket, int how) sysret_t sys_shutdown(int socket, int how)
@ -3473,28 +3484,36 @@ sysret_t sys_setsockopt(int socket, int level, int optname, const void *optval,
sysret_t sys_connect(int socket, const struct musl_sockaddr *name, socklen_t namelen) sysret_t sys_connect(int socket, const struct musl_sockaddr *name, socklen_t namelen)
{ {
int ret; int ret = 0;
rt_uint16_t family = 0;
struct sockaddr sa; struct sockaddr sa;
struct musl_sockaddr kname; struct musl_sockaddr kname;
struct sockaddr_un addr_un;
if (!lwp_user_accessable((void *)name, namelen)) if (!lwp_user_accessable((void *)name, namelen))
{ {
return -EFAULT; return -EFAULT;
} }
#ifdef SAL_USING_AF_UNIX lwp_get_from_user(&family, (void *)name, 2);
if (name->sa_family == AF_UNIX) if (family == AF_UNIX)
{ {
namelen = sizeof(struct sockaddr); if (!lwp_user_accessable((void *)name, sizeof(struct sockaddr_un)))
{
return -EFAULT;
}
lwp_get_from_user(&addr_un, (void *)name, sizeof(struct sockaddr_un));
ret = connect(socket, (struct sockaddr *)(&addr_un), namelen);
}
else
{
lwp_get_from_user(&kname, (void *)name, namelen);
sockaddr_tolwip(&kname, &sa);
ret = connect(socket, &sa, namelen);
} }
#endif /* SAL_USING_AF_UNIX */
lwp_get_from_user(&kname, (void *)name, namelen); return ret;
sockaddr_tolwip(&kname, &sa);
ret = connect(socket, &sa, namelen);
return (ret < 0 ? GET_ERRNO() : ret);
} }
sysret_t sys_listen(int socket, int backlog) sysret_t sys_listen(int socket, int backlog)

3
components/net/sal/include/sal_socket.h
View File

@ -186,8 +186,7 @@ struct sockaddr
/* Structure describing the address of an AF_LOCAL (aka AF_UNIX) socket. */ /* Structure describing the address of an AF_LOCAL (aka AF_UNIX) socket. */
struct sockaddr_un struct sockaddr_un
{ {
uint8_t sa_len; unsigned short sa_family;
sa_family_t sa_family;
char sun_path[108]; /* Path name. */ char sun_path[108]; /* Path name. */
}; };