archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 02:08:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

sys_net: Fix sys_net_bnet_getpeername page faults

Browse source 
+ EINVAL checks
This commit is contained in:
Eladash 2020-04-12 11:38:04 +03:00 • committed by Ani
parent c4f6968aae
commit 7399a3f1e9
1 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

56
rpcs3/Emu/Cell/lv2/sys_net.cpp
View file

@ -752,40 +752,26 @@ error_code sys_net_bnet_getpeername(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sock
sys_net.warning("sys_net_bnet_getpeername(s=%d, addr=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen); sys_net.warning("sys_net_bnet_getpeername(s=%d, addr=*0x%x, paddrlen=*0x%x)", s, addr, paddrlen);
// Note: paddrlen is both an input and output argument
if (!addr || !paddrlen || *paddrlen < addr.size())
{
return -SYS_NET_EINVAL;
}
::sockaddr_storage native_addr;
::socklen_t native_addrlen = sizeof(native_addr);
s32 type = 0;
const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error const auto sock = idm::check<lv2_socket>(s, [&](lv2_socket& sock) -> sys_net_error
{ {
std::lock_guard lock(sock.mutex); std::lock_guard lock(sock.mutex);
::sockaddr_storage native_addr; type = sock.type;
::socklen_t native_addrlen = sizeof(native_addr);
if (::getpeername(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen) == 0) if (::getpeername(sock.socket, reinterpret_cast<struct sockaddr*>(&native_addr), &native_addrlen) == 0)
{ {
verify(HERE), native_addr.ss_family == AF_INET; verify(HERE), native_addr.ss_family == AF_INET;
vm::ptr<sys_net_sockaddr_in> paddr = vm::cast(addr.addr());
if (paddrlen)
{
*paddrlen = sizeof(sys_net_sockaddr_in);
}
paddr->sin_len = sizeof(sys_net_sockaddr_in);
paddr->sin_family = SYS_NET_AF_INET;
paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
paddr->sin_zero = 0;
if (sock.type == SYS_NET_SOCK_DGRAM_P2P)
{
vm::ptr<sys_net_sockaddr_in_p2p> paddr_p2p = vm::cast(addr.addr());
paddr_p2p->sin_vport = paddr_p2p->sin_port - 3658;
paddr_p2p->sin_port = 3658;
struct in_addr rep;
rep.s_addr = htonl(paddr->sin_addr);
sys_net.error("Reporting P2P socket address as %s:%d:%d", rep, paddr_p2p->sin_port, paddr_p2p->sin_vport);
}
return {}; return {};
} }
@ -802,6 +788,26 @@ error_code sys_net_bnet_getpeername(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sock
return -sock.ret; return -sock.ret;
} }
*paddrlen = sizeof(sys_net_sockaddr_in);
vm::ptr<sys_net_sockaddr_in> paddr = vm::cast(addr.addr());
paddr->sin_len = sizeof(sys_net_sockaddr_in);
paddr->sin_family = SYS_NET_AF_INET;
paddr->sin_port = std::bit_cast<be_t<u16>, u16>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_port);
paddr->sin_addr = std::bit_cast<be_t<u32>, u32>(reinterpret_cast<struct sockaddr_in*>(&native_addr)->sin_addr.s_addr);
paddr->sin_zero = 0;
if (type == SYS_NET_SOCK_DGRAM_P2P)
{
vm::ptr<sys_net_sockaddr_in_p2p> paddr_p2p = vm::cast(addr.addr());
paddr_p2p->sin_vport = paddr_p2p->sin_port - 3658;
paddr_p2p->sin_port = 3658;
struct in_addr rep;
rep.s_addr = htonl(paddr->sin_addr);
sys_net.error("Reporting P2P socket address as %s:%d:%d", rep, paddr_p2p->sin_port, paddr_p2p->sin_vport);
}
return CELL_OK; return CELL_OK;
} }