Skip to content

[syscall][socket]fix socket addr bug #7876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2023
Merged

[syscall][socket]fix socket addr bug #7876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions components/lwp/lwp_syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2866,11 +2866,11 @@ sysret_t sys_accept(int socket, struct musl_sockaddr *addr, socklen_t *addrlen)

if (addr)
{
if (!lwp_user_accessable(addrlen, sizeof (socklen_t)))
if (!lwp_user_accessable(addrlen, sizeof(socklen_t)))
{
return -EFAULT;
}
lwp_get_from_user(&uaddrlen, addrlen, sizeof (socklen_t));
lwp_get_from_user(&uaddrlen, addrlen, sizeof(socklen_t));
if (!uaddrlen)
{
return -EINVAL;
Expand All @@ -2894,7 +2894,7 @@ sysret_t sys_accept(int socket, struct musl_sockaddr *addr, socklen_t *addrlen)
uaddrlen = sizeof(struct musl_sockaddr);
}
lwp_put_to_user(addr, &kmusladdr, uaddrlen);
lwp_put_to_user(addrlen, &uaddrlen, sizeof (socklen_t));
lwp_put_to_user(addrlen, &uaddrlen, sizeof(socklen_t));
}
}
return ret;
Expand Down Expand Up @@ -2937,11 +2937,11 @@ sysret_t sys_getpeername(int socket, struct musl_sockaddr *name, socklen_t *name
socklen_t unamelen;
socklen_t knamelen;

if (!lwp_user_accessable(namelen, sizeof (socklen_t *)))
if (!lwp_user_accessable(namelen, sizeof(socklen_t)))
{
return -EFAULT;
}
lwp_get_from_user(&unamelen, namelen, sizeof (socklen_t *));
lwp_get_from_user(&unamelen, namelen, sizeof(socklen_t));
if (!unamelen)
{
return -EINVAL;
Expand All @@ -2963,7 +2963,7 @@ sysret_t sys_getpeername(int socket, struct musl_sockaddr *name, socklen_t *name
unamelen = sizeof(struct musl_sockaddr);
}
lwp_put_to_user(name, &kname, unamelen);
lwp_put_to_user(namelen, &unamelen, sizeof (socklen_t *));
lwp_put_to_user(namelen, &unamelen, sizeof(socklen_t));
}
else
{
Expand All @@ -2981,11 +2981,11 @@ sysret_t sys_getsockname(int socket, struct musl_sockaddr *name, socklen_t *name
socklen_t unamelen;
socklen_t knamelen;

if (!lwp_user_accessable(namelen, sizeof (socklen_t *)))
if (!lwp_user_accessable(namelen, sizeof (socklen_t)))
{
return -EFAULT;
}
lwp_get_from_user(&unamelen, namelen, sizeof (socklen_t *));
lwp_get_from_user(&unamelen, namelen, sizeof (socklen_t));
if (!unamelen)
{
return -EINVAL;
Expand All @@ -3006,7 +3006,7 @@ sysret_t sys_getsockname(int socket, struct musl_sockaddr *name, socklen_t *name
unamelen = sizeof(struct musl_sockaddr);
}
lwp_put_to_user(name, &kname, unamelen);
lwp_put_to_user(namelen, &unamelen, sizeof(socklen_t *));
lwp_put_to_user(namelen, &unamelen, sizeof(socklen_t));
}
else
{
Expand Down