git: f28ae9abf8bb - stable/13 - pf: fix SCTP SDT probe
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Oct 2023 16:11:47 UTC
The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f28ae9abf8bb848bcad47c2aa7ac19241eb0fa36 commit f28ae9abf8bb848bcad47c2aa7ac19241eb0fa36 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2023-10-05 14:57:50 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2023-10-12 07:47:17 +0000 pf: fix SCTP SDT probe We want the return value of pf_test_rule(), i.e. the result of the evaluation of the new state, not the result of the evaluation of the original packet/state. MFC after: 1 week Sponsored by: Orange Business Services (cherry picked from commit b00dbe851c66f26a16219d31c76b7fb411ace94c) --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 501d9eef57cd..869c68ad308f 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5365,7 +5365,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, ret = pf_test_rule(&r, &sm, pd->dir, kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); - SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action); + SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); if (sm) { /* Inherit v_tag values. */ sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags;