Skip to content

Fix path validation deadlock after peer address verification #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aswanthk777 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix path validation deadlock after peer address verification #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/connection/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,18 @@ impl Path {
}

/// Whether PATH_CHALLENGE or PATH_RESPONSE should be sent on the path.
///
/// The anti-amplification limit only applies while the peer's address is
/// unverified, mirroring inc/dec/cmp_anti_ampl_limit: once the first
/// PATH_RESPONSE arrives the limit is frozen, and consulting the frozen
/// value here would deadlock validation of a path that was opened by a
/// small packet (e.g. a NAT rebinding) — the path gets stuck in
/// ValidatingMTU because the padded challenge is never allowed out.
pub(super) fn need_send_validation_frames(&self, is_server: bool) -> bool {
if is_server && self.anti_ampl_limit < MIN_PATH_PROBE_SIZE {
if is_server
&& !self.verified_peer_address
&& self.anti_ampl_limit < MIN_PATH_PROBE_SIZE
{
return false;
}

Expand All @@ -314,7 +324,10 @@ impl Path {
if self.validated() {
return false;
}
if is_server && self.anti_ampl_limit <= self.recovery.max_datagram_size {
if is_server
&& !self.verified_peer_address
&& self.anti_ampl_limit <= self.recovery.max_datagram_size
{
return false;
}
true
Expand Down