From nobody Thu Oct 12 16:11:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S5vln2B4gz4wb7y; Thu, 12 Oct 2023 16:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S5vln1Mw6z3DTV; Thu, 12 Oct 2023 16:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697127109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJocnbj9jBrn13w9uQbErlUIr5nytWcbnclcmj8hABY=; b=J1ANYcjOpsRll5NwhySHN7MF5EwgwhRuLWE13aZumNDW3g5/oMy1LVIYCGzx2CDlPz/5E4 6dZme/dtXIycqVJQZBDFBWh9jnS1NMXgI05OQBVUdzf0kYNOYIyzGYBJqJAg1ecT9pQ0sj yvDbG1ooLRFi0mcta4ATpdS5HbJEWmbZ9bO6i78XDHMPdAgD9AITxWE7s+FND3jvBj4E5E 282285qzVHrHAZxFKbFwR1lFw4UoEsmWiXq3CTKwFHtrNJxY1ixAn5KUSTcc3JUDRAMaDr pZDD7EKqfaanmynnI6o4Gh4g/9LlOkgIte56Yh8Wd63ZEwjnc94mP8TXqJxAfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697127109; a=rsa-sha256; cv=none; b=JrHXSG5yJNvQgiDxdVS4hTUMmu8YkVlHeX/4S2He4KkJoc4NOMKARqL0picL5m+XfkzcoO 6d7dxtvi1Qd2oa+aemfRRt2nzH2cY1vSvg4P9ocwdodXHNeqL54akAIwxPzD99OmQ/z7La vlnHZkxjbYWn2FKA9GOclmW5TT/ph7L/PMwNBafH5hog2NAhmIc+DjzCCyQtuDaoOb1omy 9FDjcVb9MlYdpYY0r9T9YvPop3YiYaiGOrocoiq3i6vI+2r/9veehku59EhCjBO7DJnjwP DQJHEvchHSPCOR0JNrDO9LF60nWx/uH0kra4L1wuT/uxWZEimPl7DkZx9BDSwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697127109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gJocnbj9jBrn13w9uQbErlUIr5nytWcbnclcmj8hABY=; b=TFGnixzkV3asrugU1Cd4MFd6ARhRFf3ahzcPayYBEorLCU3OHeoEhcSMXhKcDdDWpcR/zl RPWX53c/qdENq8bxQ6D+fjjKe1oxBh5Zf5rTf/I3N7lDrz4cCRa375FoTKpD66OYpK+4kN tiATBG9rJVF40YkHsrBQXES0kVF1+osCfWsJ4ciSu51XP9JaBOfXPNRXVI7lhb5BSIedXe z1gxjUkZnJYefEsx90L5rib2TW7eoYyTO0BSPjIUJOOyDptsOAAJn0BOgY8vH3qgnANz1W V3noWV2U9/w7gHa1OjTXY2IeXs1SJ2QYW/fNQ4PutOC47/NP1ORK+NKCvJ5UVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S5vln0PvNz19F8; Thu, 12 Oct 2023 16:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39CGBmOC072840; Thu, 12 Oct 2023 16:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CGBmSo072837; Thu, 12 Oct 2023 16:11:48 GMT (envelope-from git) Date: Thu, 12 Oct 2023 16:11:48 GMT Message-Id: <202310121611.39CGBmSo072837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ee0b7276372e - stable/14 - pf: fix SCTP SDT probe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ee0b7276372ebe07cd231b55d42ab3a4200f53c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ee0b7276372ebe07cd231b55d42ab3a4200f53c0 commit ee0b7276372ebe07cd231b55d42ab3a4200f53c0 Author: Kristof Provost AuthorDate: 2023-10-05 14:57:50 +0000 Commit: Kristof Provost CommitDate: 2023-10-12 07:47:06 +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 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;