RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-10-11 22:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reject invalid signaling RTT timestamps

Browse Source 
Signaling peers control the timestamps used for RTT calculation. A
future timestamp wraps the unsigned delta, and the fatal checked cast
terminates the signaling thread.

Reject future and oversized RTT values before updating peer state.
This commit is contained in:
Acts1631
2026-10-07 15:19:45 +03:00
committed by Elad
parent 479ca74cad
commit 5f8dd1de61
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/NP/signaling_handler.cpp
+20 -9
View File
@@ -280,8 +280,6 @@ void signaling_handler::process_incoming_messages()
}
const auto now = steady_clock::now();
if (si)
si->time_last_msg_recvd = now;
const auto setup_ping = [&]()
{
@@ -299,10 +297,16 @@ void signaling_handler::process_incoming_messages()
queue_signaling_packet(sent_packet, si, now + REPEAT_PING_DELAY);
};
const auto update_rtt = [&](u64 rtt_timestamp)
const auto update_rtt = [&](u64 rtt_timestamp) -> bool
{
u64 timestamp_now = get_micro_timestamp(now);
u64 rtt = timestamp_now - rtt_timestamp;
const u64 timestamp_now = get_micro_timestamp(now);
if (rtt_timestamp > timestamp_now || timestamp_now - rtt_timestamp > std::numeric_limits<u32>::max())
{
sign_log.error("Received a signaling packet with an invalid RTT timestamp");
return false;
}
const u64 rtt = timestamp_now - rtt_timestamp;
si->last_rtts[(si->rtt_counters % 6)] = rtt;
si->rtt_counters++;
@@ -313,7 +317,8 @@ void signaling_handler::process_incoming_messages()
sum += si->last_rtts[index];
}
si->rtt = ::narrow<u32>(sum / num_rtts);
si->rtt = static_cast<u32>(sum / num_rtts);
return true;
};
switch (sp->command)
@@ -325,7 +330,8 @@ void signaling_handler::process_incoming_messages()
sent_packet.timestamp_sender = sp->timestamp_sender;
break;
case signal_pong:
update_rtt(sp->timestamp_sender);
if (!update_rtt(sp->timestamp_sender))
continue;
reply = false;
schedule_repeat = false;
reschedule_packet(si, signal_ping, now + 10s);
@@ -344,7 +350,8 @@ void signaling_handler::process_incoming_messages()
update_si_addr(si, op_addr, op_port);
break;
case signal_connect_ack:
update_rtt(sp->timestamp_sender);
if (!update_rtt(sp->timestamp_sender))
continue;
reply = true;
schedule_repeat = false;
setup_ping();
@@ -356,7 +363,8 @@ void signaling_handler::process_incoming_messages()
update_si_status(si, SCE_NP_SIGNALING_CONN_STATUS_ACTIVE, CELL_OK);
break;
case signal_confirm:
update_rtt(sp->timestamp_receiver);
if (!update_rtt(sp->timestamp_receiver))
continue;
reply = false;
schedule_repeat = false;
setup_ping();
@@ -381,6 +389,9 @@ void signaling_handler::process_incoming_messages()
default: sign_log.error("Invalid signaling command received"); continue;
}
if (si)
si->time_last_msg_recvd = now;
if (reply)
{
send_signaling_packet(sent_packet, op_addr, op_port);