From nobody Thu Oct 5 16:11:16 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 4S1c4N3lV2z4vvKs; Thu, 5 Oct 2023 16:11:16 +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 4S1c4N3DcZz3Rsq; Thu, 5 Oct 2023 16:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696522276; 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=OiJ7pc/J4ZnQmR9TPvQoWCug/9x4F+LoI93Yb1yUlaA=; b=LT2rneizug+lAn2SjpM+p0ZnfenAJmkuPgBRLEqD4u454HA2dd0sZbVoRWSQUHho23JN1W 9HKCti2KyfV/lsOOShqhIraYSZLg7gevi5tre7tJSngbWnI/gL6JcOdiCqy1I6wXnXTkPp N27KwQzGvbovvR4q63DWvUk2LRqyLB4UI6wgFfsWBGyDIx6n+Kym0S+P057PrFufmoTJMM rYPM3uFCFk/GCJqa/byJYWh7TQgcsQGNcAroJKMcYiPXQrGNC+qr4q2eM45WoPkgAi4dqa GOtL9XlL6Ou/Yl4pxtaUuOPwZ0RRzLetCsCtYFzLv3UBVDOp20da+ZQWEAPVZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696522276; a=rsa-sha256; cv=none; b=wGLSykwYXSjQbFhDE4ndolBmR0MEVQPdfXQge0FBK9ryrymjdDcSXutw9cgARVKhGNuCms wJko11cXLE380WZPlp2HcngySlnJcn9vTAVB71Ta7lq1y8N+rhuuZ1N6/cbL76r3Q8w120 t9UjtG2xQENbm/ZnQ+5oSvheWZPWnLiOvxjqc8Y2tDMXExPQ7JnRyqU/ccJzbu9B++VSFr tmU2qWMJpq+2PeNcgiQ/qjGyZDQoGgQDmTTXiO4TQBaCVYyjhDCpGWVAlUUevcHXw3WcQw flEWefVSL7Or928vQrUAg3UpeUi2vtrzlI9xdj1rfwBlTFmNUdY2hfsd9nWhoQ== 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=1696522276; 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=OiJ7pc/J4ZnQmR9TPvQoWCug/9x4F+LoI93Yb1yUlaA=; b=eUncZdJ//DmAKwAvwSL7n09qx6efa87j9e6hnl6lNNjZfotp9OVLep3ZdYA7uqLUgSGBm+ ZQvLgqhPGD/OGM8iOyPRmBZ7SVqImfil31bGo7KeuKPpWe6KcKydnEyjgMV2ApemJYexVl zEemp3HFgzW145TTKnIWaUZRRVmPT5l/gU3y6tMz2F90t7VG/I/Lby1SfibM/2BGB8REdW ytSvzo13SzBaR0ozWClzkJF86bqTpQyMyKrvJ5CT4kXUQVL31X8zA+SzDHHoBD5fJyHR0c WHLvAss+3GzUOlocptRR8WMEeOoZjXrN+rHeXAOU+ms1Oo4CqvxHEV8LAOMfWw== 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 4S1c4N2Dt1z1Qsj; Thu, 5 Oct 2023 16:11:16 +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 395GBGC9078009; Thu, 5 Oct 2023 16:11:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395GBGOQ078006; Thu, 5 Oct 2023 16:11:16 GMT (envelope-from git) Date: Thu, 5 Oct 2023 16:11:16 GMT Message-Id: <202310051611.395GBGOQ078006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b00dbe851c66 - main - 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/main X-Git-Reftype: branch X-Git-Commit: b00dbe851c66f26a16219d31c76b7fb411ace94c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b00dbe851c66f26a16219d31c76b7fb411ace94c commit b00dbe851c66f26a16219d31c76b7fb411ace94c Author: Kristof Provost AuthorDate: 2023-10-05 14:57:50 +0000 Commit: Kristof Provost 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;