The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d18ed24a9e9b156770391afad92f32fe860a7ca9
commit d18ed24a9e9b156770391afad92f32fe860a7ca9
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2025-06-27 08:28:05 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2025-06-30 07:53:27 +0000
pf: trade few 'goto unlock: for 'break' in pf_test()
OK mpi@, OK henning@, OK jca@
Obtained from: OpenBSD, sashan <sas...@openbsd.org>, 18b958d7c9
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/netpfil/pf/pf.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 41fd8a441a05..b24bbe036141 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -10593,7 +10593,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct
ifnet *ifp, struct mbuf **m0
use_2nd_queue = 1;
action = pf_normalize_tcp(&pd);
if (action == PF_DROP)
- goto done;
+ break;
action = pf_test_state(&s, &pd, &reason);
if (action == PF_PASS || action == PF_AFRT) {
if (V_pfsync_update_state_ptr != NULL)
@@ -10642,7 +10642,7 @@ pf_test(sa_family_t af, int dir, int pflags, struct
ifnet *ifp, struct mbuf **m0
case IPPROTO_SCTP:
action = pf_normalize_sctp(&pd);
if (action == PF_DROP)
- goto done;
+ break;
/* fallthrough */
case IPPROTO_UDP:
default:
@@ -10665,14 +10665,14 @@ pf_test(sa_family_t af, int dir, int pflags, struct
ifnet *ifp, struct mbuf **m0
REASON_SET(&reason, PFRES_NORM);
DPFPRINTF(PF_DEBUG_MISC,
("dropping IPv6 packet with ICMPv4 payload"));
- goto done;
+ break;
}
if (pd.virtual_proto == IPPROTO_ICMPV6 && af != AF_INET6) {
action = PF_DROP;
REASON_SET(&reason, PFRES_NORM);
DPFPRINTF(PF_DEBUG_MISC,
("pf: dropping IPv4 packet with ICMPv6 payload\n"));
- goto done;
+ break;
}
action = pf_test_state_icmp(&s, &pd, &reason);
if (action == PF_PASS || action == PF_AFRT) {
