Date: Mon, 23 Aug 2021 13:52:08 GMT
From: Mateusz Guzik <mjg@FreeBSD.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject: git: f978fe565e61 - stable/12 - pf: assert dir state on pf_test{,6}
Message-ID: <202108231352.17NDq81B032369@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f978fe565e61b0f76ad60fa53b8a3476e17d0f84 commit f978fe565e61b0f76ad60fa53b8a3476e17d0f84 Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2021-08-17 18:16:09 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2021-08-23 13:49:17 +0000 pf: assert dir state on pf_test{,6} The intent is to line up various enums so that branching in the lines of: idx = (dir == PF_IN ? PF_SK_WIRE : PF_SK_STACK); is avoided. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 3e875f952af05697807139b460e5124eb5f6137b) --- sys/netpfil/pf/pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ae2fdbc32401..a690029a1446 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6210,7 +6210,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb * int off, dirndx, pqid = 0; PF_RULES_RLOCK_TRACKER; - + KASSERT(dir == PF_IN || dir == PF_OUT, ("%s: bad direction %d\n", __func__, dir)); M_ASSERTPKTHDR(m); if (!V_pf_status.running) @@ -6661,6 +6661,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb int off, terminal = 0, dirndx, rh_cnt = 0, pqid = 0; PF_RULES_RLOCK_TRACKER; + KASSERT(dir == PF_IN || dir == PF_OUT, ("%s: bad direction %d\n", __func__, dir)); M_ASSERTPKTHDR(m); if (!V_pf_status.running)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108231352.17NDq81B032369>