diff options
| author | Kristof Provost <kp@FreeBSD.org> | 2023-11-29 18:06:31 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2023-12-05 18:36:44 +0000 |
| commit | f0327f9d86aa54ab6de42ca7694899b97064bde7 (patch) | |
| tree | 711c235aa7374ed30831974c6580b1cdf8184e2f | |
| parent | 1f71f08e3b18ea0d92054bcb5b70f2b3be9318c8 (diff) | |
| download | src-f0327f9d86aa54ab6de42ca7694899b97064bde7.tar.gz src-f0327f9d86aa54ab6de42ca7694899b97064bde7.zip | |
pf: remove incorrect fragmentation check
We do not need to check PFDESC_IP_REAS while tracking TCP state.
Moreover, this check incorrectly considers no-data packets (e.g. RST) to
be in-window when this flag is not set.
Sponsored by: Rubicon Communications, LLC ("Netgate")
Approved by: so
Security: FreeBSD-SA-23:17.pf
(cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda)
(cherry picked from commit 0415f0554b72b93a1986292d28f679594f6ce6a6)
| -rw-r--r-- | sys/netpfil/pf/pf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 0a6928e3d4eb..eeb4a2c1cc78 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4601,8 +4601,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) { |