From nobody Fri Nov 24 14:10: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 4ScH2J11SCz52bW0; Fri, 24 Nov 2023 14:10: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 4ScH2H4h6Jz3fqy; Fri, 24 Nov 2023 14:10:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700835047; 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=gc7i84h1OzOtPUbFAZEXbbVW5vtS7O8Nu0OAf5cSfhs=; b=a0s41VQMA182WAqFSG+kNkox13RXXJggYAKMdiQrhNHXF1pcL2YYydyK/0x1YE6wa4OoO9 e2X2ksaSWZzob4zbrTsBHzW06MS3xTwCxE903BCXw1H+XjwzjdExaIDIiLfq0d0yV1mAqJ q+xTMbxABWL2Yyhn1DMZ0ol2mGlcSB7xZgxXSpE8B/82PaWHOE1E+mEqbT6CbSk0/VWLFJ 5l882XkNFgZdcrLc4UkTi0Hl9l4QhheI4LlzGJXXLE7hGL5U1qZklcHeslYq/sU6hObgDI g+gJLseFSwltG5KBmgYagh2CQmSFSFkZu/ruP63Kc7dGW2X5ePgVl7LZH6ZMyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700835047; 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=gc7i84h1OzOtPUbFAZEXbbVW5vtS7O8Nu0OAf5cSfhs=; b=jIOYPnVDNMfFK0rOJ+7zztPcNaSjysgz+Z2K/1Eqb8JySRSsZccT/j+hZA5QZ8sFMS4uEK IEFfOWAmxCWmaWuTl9YRq5apjscoN0wtXheM3ekefAwOi65UWWTRgHupTnESTXTMu5qXgN 74yDQKa1cml0LOQNj6WV0CswNBBpisKnlYpC2dcU9rPlDIlimuLEzvtUrQZqC8MS3Do99d m5LS8TUzLjlx/wbfYwef0u/FQNkD2oMK1YluxBjuK+n6pUJzKaZgYCcPMrQf3qcKgMWP72 OQ/W2JXmMeMm8Uv6gUP4X2eIxi/HOrva4pSroMFHqqxXQL/kv42X3yPA/oIlKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700835047; a=rsa-sha256; cv=none; b=Kf1J7tU3qEpq/OFAU6paIQjqIq3ppxnoJCjlcQtE7F/oconlGWLCOTX58FrS/v2Iwrqnbb FablYssAbD2x8ZcZg2XiZi+xGbWvaki1LSB/2KlVQ2OxmUG+DkBmxXjAKCoaBZtnWwt5WZ WNvttxPUGelKDJVRIKIBfv7EhlyGeUrCB+EtBaxykmKUT2qRW2jrGsIf9Lm9Pv9UvSoImx Lp5UoBXCNeYTZX3AguIUWOiZy8UTPUh/oJ9KjA8RwKpWguOQvR2mLINy34LUEygqorZCZz QhkmJYkEcgQ+KpyRNVfhXlxYkmY6DWYx6EcRNnhG/SOCkPqeS2x78wFw+1C2wg== 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 4ScH2H3m0Pznsc; Fri, 24 Nov 2023 14:10:47 +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 3AOEAlMH025047; Fri, 24 Nov 2023 14:10:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOEAl11025044; Fri, 24 Nov 2023 14:10:47 GMT (envelope-from git) Date: Fri, 24 Nov 2023 14:10:47 GMT Message-Id: <202311241410.3AOEAl11025044@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: 147f278d7d4b - stable/13 - pf: always create multihomed states as floating 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: 147f278d7d4b0e9550d6a8e47082251c6ce7d136 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=147f278d7d4b0e9550d6a8e47082251c6ce7d136 commit 147f278d7d4b0e9550d6a8e47082251c6ce7d136 Author: Kristof Provost AuthorDate: 2023-11-16 16:06:29 +0000 Commit: Kristof Provost CommitDate: 2023-11-24 09:20:22 +0000 pf: always create multihomed states as floating When we create a new state for multihomed sctp connections (i.e. based on INIT/INIT_ACK or ASCONF parameters) we cannot know what interfaces we'll be seeing that traffic on. Make those states floating, irrespective of state policy. MFC after: 1 week Sponsored by: Orange Business Services (cherry picked from commit 0fe663b2a815dcb41431543940ec51408f418392) --- sys/netpfil/pf/pf.c | 8 ++++++-- tests/sys/netpfil/pf/sctp.py | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1323a1003af8..84ff1fea7731 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5540,8 +5540,12 @@ again: j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; PF_RULES_RLOCK(); sm = NULL; - /* XXX: May generated unwanted abort if we try to insert a duplicate state. */ - ret = pf_test_rule(&r, &sm, pd->dir, kif, + /* + * New connections need to be floating, because + * we cannot know what interfaces it will use. + * That's why we pass V_pfi_all rather than kif. + */ + ret = pf_test_rule(&r, &sm, pd->dir, V_pfi_all, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, ret); diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 5db52dd993f2..6042badffb64 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -372,6 +372,7 @@ class TestSCTP(VnetTestTemplate): ToolsHelper.print_output("/sbin/pfctl -e") ToolsHelper.pf_rules([ + "set state-policy if-bound", "block proto sctp", "pass inet proto sctp to 192.0.2.0/24"]) @@ -386,9 +387,9 @@ class TestSCTP(VnetTestTemplate): # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1, but also to 192.0.2.4 states = ToolsHelper.get_output("/sbin/pfctl -ss") print(states) - assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r".*sctp 192.0.2.1:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.1:.*192.0.2.2:1234", states) - assert re.search(r"all sctp 192.0.2.4:.*192.0.2.3:1234", states) + assert re.search(r".*sctp 192.0.2.4:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.4:.*192.0.2.2:1234", states) class TestSCTPv6(VnetTestTemplate):