Browse Source

fix termination block processing and size check

pull/1950/head
Vort 1 year ago
parent
commit
ea7cf1cf69
  1. 2
      libi2pd/NTCP2.cpp
  2. 9
      libi2pd/SSU2Session.cpp

2
libi2pd/NTCP2.cpp

@ -884,7 +884,7 @@ namespace transport
auto size = bufbe16toh (frame + offset); auto size = bufbe16toh (frame + offset);
offset += 2; offset += 2;
LogPrint (eLogDebug, "NTCP2: Block type ", (int)blk, " of size ", size); LogPrint (eLogDebug, "NTCP2: Block type ", (int)blk, " of size ", size);
if (size > len) if (offset + size > len)
{ {
LogPrint (eLogError, "NTCP2: Unexpected block length ", size); LogPrint (eLogError, "NTCP2: Unexpected block length ", size);
break; break;

9
libi2pd/SSU2Session.cpp

@ -1486,7 +1486,7 @@ namespace transport
auto size = bufbe16toh (buf + offset); auto size = bufbe16toh (buf + offset);
offset += 2; offset += 2;
LogPrint (eLogDebug, "SSU2: Block type ", (int)blk, " of size ", size); LogPrint (eLogDebug, "SSU2: Block type ", (int)blk, " of size ", size);
if (size > len) if (offset + size > len)
{ {
LogPrint (eLogError, "SSU2: Unexpected block length ", size); LogPrint (eLogError, "SSU2: Unexpected block length ", size);
break; break;
@ -1532,7 +1532,9 @@ namespace transport
break; break;
case eSSU2BlkTermination: case eSSU2BlkTermination:
{ {
uint8_t rsn = buf[11]; // reason if (size >= 9)
{
uint8_t rsn = buf[offset + 8]; // reason
LogPrint (eLogDebug, "SSU2: Termination reason=", (int)rsn); LogPrint (eLogDebug, "SSU2: Termination reason=", (int)rsn);
if (IsEstablished () && rsn != eSSU2TerminationReasonTerminationReceived) if (IsEstablished () && rsn != eSSU2TerminationReasonTerminationReceived)
RequestTermination (eSSU2TerminationReasonTerminationReceived); RequestTermination (eSSU2TerminationReasonTerminationReceived);
@ -1542,6 +1544,9 @@ namespace transport
m_State = eSSU2SessionStateClosingConfirmed; m_State = eSSU2SessionStateClosingConfirmed;
Done (); Done ();
} }
}
else
LogPrint(eLogWarning, "SSU2: Unexpected termination block size ", size);
break; break;
} }
case eSSU2BlkRelayRequest: case eSSU2BlkRelayRequest:

Loading…
Cancel
Save