mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-09-24 10:19:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sys_net: Fix sys_net_bnet_connect page faults

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

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

@ -560,13 +560,35 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
sys_net.warning("sys_net_bnet_connect(s=%d, addr=*0x%x, addrlen=%u)", s, addr, addrlen); sys_net.warning("sys_net_bnet_connect(s=%d, addr=*0x%x, addrlen=%u)", s, addr, addrlen);
const auto psa_in = vm::_ptr<sys_net_sockaddr_in>(addr.addr()); if (!addr || addrlen < addr.size())
{
return -SYS_NET_EINVAL;
}
struct
{
alignas(16) char buf[sizeof(sys_net_sockaddr)];
bool changed = false;
} addr_buf;
const auto psa_in = reinterpret_cast<sys_net_sockaddr_in*>(addr_buf.buf);
const auto _addr = reinterpret_cast<sys_net_sockaddr*>(addr_buf.buf);
s32 result = 0; s32 result = 0;
::sockaddr_in name{}; ::sockaddr_in name{};
name.sin_family = AF_INET; name.sin_family = AF_INET;
name.sin_port = std::bit_cast<u16>(psa_in->sin_port);
name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr); if (idm::check<lv2_socket>(s))
{
std::memcpy(addr_buf.buf, addr.get_ptr(), 16);
name.sin_port = std::bit_cast<u16>(psa_in->sin_port);
name.sin_addr.s_addr = std::bit_cast<u32>(psa_in->sin_addr);
}
else
{
return -SYS_NET_EBADF;
}
::socklen_t namelen = sizeof(name); ::socklen_t namelen = sizeof(name);
sys_net.warning("Attempting to connect on %s:%d", name.sin_addr, std::bit_cast<be_t<u16>, u16>(name.sin_port)); // ntohs(name.sin_port) sys_net.warning("Attempting to connect on %s:%d", name.sin_addr, std::bit_cast<be_t<u16>, u16>(name.sin_port)); // ntohs(name.sin_port)
@ -575,7 +597,7 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
{ {
std::lock_guard lock(sock.mutex); std::lock_guard lock(sock.mutex);
if (addr->sa_family == 0 && !psa_in->sin_port && !psa_in->sin_addr) if (_addr->sa_family == 0 && !psa_in->sin_port && !psa_in->sin_addr)
{ {
const auto nph = g_fxo->get<named_thread<np_handler>>(); const auto nph = g_fxo->get<named_thread<np_handler>>();
@ -587,13 +609,14 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
psa_in->sin_family = SYS_NET_AF_INET; psa_in->sin_family = SYS_NET_AF_INET;
psa_in->sin_port = 53; psa_in->sin_port = 53;
psa_in->sin_addr = nph->get_dns(); psa_in->sin_addr = nph->get_dns();
addr_buf.changed = true;
sys_net.warning("sys_net_bnet_connect: using DNS..."); sys_net.warning("sys_net_bnet_connect: using DNS...");
nph->add_dns_spy(s); nph->add_dns_spy(s);
} }
else if (addr->sa_family != SYS_NET_AF_INET) else if (_addr->sa_family != SYS_NET_AF_INET)
{ {
sys_net.error("sys_net_bnet_connect(s=%d): unsupported sa_family (%d)", s, addr->sa_family); sys_net.error("sys_net_bnet_connect(s=%d): unsupported sa_family (%d)", s, _addr->sa_family);
} }
if (::connect(sock.socket, reinterpret_cast<struct sockaddr*>(&name), namelen) == 0) if (::connect(sock.socket, reinterpret_cast<struct sockaddr*>(&name), namelen) == 0)
@ -682,6 +705,11 @@ error_code sys_net_bnet_connect(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr
return -SYS_NET_EBADF; return -SYS_NET_EBADF;
} }
if (addr_buf.changed)
{
std::memcpy(addr.get_ptr(), addr_buf.buf, sizeof(addr_buf.buf));
}
if (!sock.ret && result) if (!sock.ret && result)
{ {
if (result == SYS_NET_EWOULDBLOCK || result == SYS_NET_EINPROGRESS) if (result == SYS_NET_EWOULDBLOCK || result == SYS_NET_EINPROGRESS)