ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: Fix MacOS crash upon receiving an ICMP reply 

Apple (old BSD)'s raw IP sockets implementation converts the
`ip_len` field to host byte order, but also subtracts the
IP header length as well.

This caused us to effectively subtract the header length twice
and allocate the return ping in `ICMP_Session::Recv()
with a negative size, crashing PCSX2.
This commit is contained in:
Abel Briggs 2024-04-29 20:36:57 -07:00 committed by Connor McLaughlin
parent e862e68192
commit 8e5b84b097
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcsx2/DEV9/Sessions/ICMP_Session/ICMP_Session.cpp
View File

@ -430,13 +430,10 @@ namespace Sessions
offset = headerLength;
#ifdef __APPLE__
//Apple (old BSD)'s raw IP sockets implementation converts the ip_len field to host byte order
//and additionally subtracts the header length.
//https://www.unix.com/man-page/mojave/4/ip/
//"Note that the ip_off and ip_len fields are in host byte order."
//Any other bugs? FreeBSD notes the following
//Before FreeBSD 11.0 packets received on raw IP sockets had the ip_len and ip_off fields converted to host byte order.
//Before FreeBSD 10.0 packets received on raw IP sockets had the ip_hl sub-tracted from the ip_len field.
//TODO, test
length = ipHeader->ip_len - headerLength;
length = ipHeader->ip_len;
#else
length = ntohs(ipHeader->ip_len) - headerLength;
#endif