From nobody Thu Oct 12 16:11:47 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 4S5vlm1Z9Wz4wZt4; Thu, 12 Oct 2023 16:11:48 +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 4S5vlm194Vz3DG7; Thu, 12 Oct 2023 16:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697127108; 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=TTq3x+ITgpt08KLfZhl1e2Q4W896llKtOeRcBzCiipo=; b=DriA04zTHaFcPii0BHtoCWQB184oVQ2sr4GktzlXcWaNkm49qI0ZME4LRxZTMwdoOyMIwT cNCAjIkXNBmV5isSYZfOB2IWPlC8JTLWI72FXwnTdPjHYJp8mHZkuMrloM/xxga3Ep4efD /ihY5y4qo8NgIkN9HCMUeK5fPj1ANMRsRKK0/B0kjlQokXhI7V9RXPpsyNUKTsKh9fqZAD KCc84lNGANgfJoOGztQ5s/GA966fCpwf0DvlKqSnJgC3TZbFemi8UyZH1alo7zaZFm3GNX dTnJU1M7lPRXM35fpPf5MKgPNqUx2s6MGeIEX4RcXVwXlpUZSLbrdnOf6mZh4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697127108; a=rsa-sha256; cv=none; b=SoaecOQHj8i5ZAvF7IKVtsUTsa+ibepokxdnErgdjY5Mdm852O7y4sMh1jAeAWSzB6D2Bi bUTqKnf+n+iAB1zUlJSLacZ7oOjLHjHuFN6NG8+z6AElj4sB2hqoElX9FdnaJUqT99PKGB cSfUERWcPztZEfIYp+8BIeYNrAl9QXzyNdCIf7H/LKSpD9p6a49EesienPZGASBlurujXV nJEAm1HbuSgdRcDsr/SxFkGZX8NVWWb0apJywh1bEeCVuPjQNMYUCIJj6HrU60iymIJpSg sO4X/QDX0qHv5XPYa+CCgpptfE+3PND5iD0mQyVcTXT5FosyS8nlhsxNuir3UQ== 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=1697127108; 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=TTq3x+ITgpt08KLfZhl1e2Q4W896llKtOeRcBzCiipo=; b=yGewFQKiHALkZo12HvVT977U6oMqd7WJAF9gt2Ia3sXSMCCj4MrwqVbuHAcnytoklLGYQ0 EBeabjooIq5HO1DJM1RYGe4I9K5QToWdyunMtiBAHMulcbNJpQqolxUp4093wBSq9h49x7 Aw1SDzTincij/bHlT3GshMWPAg9617kUDcRhBzeZlK50zakbN1fuEGXi+uMZRcLfVJPoYt nZ5aO5MXZxFU5q5IW6CuiNw4p8yb0hkALBgyhDv1z7RJr3uoyMQ2lIxXbSN864HTqvKUEt f7GbmgpsWXTH3FtOzODDhz3rwpIatlRohidT9OeTb6Eilh7TTb7WXhI/FVGmuQ== 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 4S5vlm0F1Xz19gQ; Thu, 12 Oct 2023 16:11:48 +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 39CGBlU8072797; Thu, 12 Oct 2023 16:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CGBl5x072794; Thu, 12 Oct 2023 16:11:47 GMT (envelope-from git) Date: Thu, 12 Oct 2023 16:11:47 GMT Message-Id: <202310121611.39CGBl5x072794@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: f28ae9abf8bb - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f28ae9abf8bb848bcad47c2aa7ac19241eb0fa36 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f28ae9abf8bb848bcad47c2aa7ac19241eb0fa36 commit f28ae9abf8bb848bcad47c2aa7ac19241eb0fa36 Author: Kristof Provost AuthorDate: 2023-10-05 14:57:50 +0000 Commit: Kristof Provost 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;