The branch main has been updated by kp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b00dbe851c66f26a16219d31c76b7fb411ace94c

commit b00dbe851c66f26a16219d31c76b7fb411ace94c
Author:     Kristof Provost <[email protected]>
AuthorDate: 2023-10-05 14:57:50 +0000
Commit:     Kristof Provost <[email protected]>
CommitDate: 2023-10-05 15:53:13 +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
---
 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 fae0bd2854f9..3dddfdd0b1a4 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -5943,7 +5943,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, 
struct pfi_kkif *kif,
                        ret = pf_test_rule(&r, &sm, 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;

Reply via email to