When checking the sequence number of a TCP header embedded in an
ICMP error message, do not access th_flags. The field is beyond the first eight bytes of the header that are required to be present and were pulled up in the mbuf. A random value of th_flags can have TH_SYN set, which made the sequence number comparison not apply the window scaling factor, which led to legitimate ICMP(v6) packets getting blocked with "BAD ICMP" debug log messages (if enabled with pfctl -xm), thus breaking PMTU discovery. Triggering the bug requires TCP window scaling to be enabled (sysctl net.inet.tcp.rfc1323, enabled by default) on both end- points of the TCP connection. Large scaling factors increase the probability of triggering the bug. PR: kern/115413: [ipv6] ipv6 pmtu not working Tested by: Jacek Zapala Reviewed by: mlaier Approved by: re (kensmith)
This commit is contained in:
parent
527f4a62ae
commit
7f368082ad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=171929
@ -5445,8 +5445,7 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
|
||||
dst = &(*state)->dst;
|
||||
}
|
||||
|
||||
if (src->wscale && dst->wscale &&
|
||||
!(th.th_flags & TH_SYN))
|
||||
if (src->wscale && dst->wscale)
|
||||
dws = dst->wscale & PF_WSCALE_MASK;
|
||||
else
|
||||
dws = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user