From nobody Mon Oct 2 09:33:25 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 4RzbNk1qXDz4vr3r; Mon, 2 Oct 2023 09:33:26 +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 4RzbNj6fYyz4SMr; Mon, 2 Oct 2023 09:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696239206; 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=zbZAT+BID809NzDHo11CdyaNrShAl4KynROZBAeZ6Ho=; b=KEiXjmTDaIyoXyHZt/Ikvyqf9JApXCtv20nb2oqpLjP68Ny/ucQazzJheVRUtU8v4OEGNS ahPmceuNIE7BzvQW2O6sFv47nwKPilss1JjtdLr7rVVhZhSbzwYopGsS/vEcDZiJSOU/3T 4cONMvWZhDV3KqFoMmxs8AKb2Hz1w4GWcRQarmYUloXmf/jxmh+o9HetpFCDXVIrYE6SYc DwwNnWtwXQnuJcvJkVY30y8NQm2HSCpa59N0m/d19gF4MuWZKNnVhRwCL10Z8w18wO7u3R KGqQupkA1qb0m2lqdWCi/gb2Lu/dgFqAfuDpHuwEb6seaf66kE3z3ICorU+gyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696239206; a=rsa-sha256; cv=none; b=rT9A4aJaQ2CspS1WwtsLcA8A/TwBBwhOOtSEiyglub/S7hYPMXGe2YZ6Bfy8oSo2IXvCJB FZ8Cbsnezrr97nYYkWBdPOoHHCdNYLsNEssTuR0H+YruJoD+DDCtzXM++FEUgEirYcpyR5 7Rn0x90Z0V6swOmI3W02uqhVZI5OYoW5qQiQPaHCXfbVIGq1iXy97b5S9lmxzTprjxAh+a zCBkh0m+vDTclEsGGSuCurKRqENmv/vlSKzWOV/1Wb80+6SLbt0nmZ6H6BrEbJMz5ESYGy ZEooCRHyqw5GPf4yS4sVKcJk5l8mcl21MHqI5rL4xP/0HCWMAapambO8IiSsrg== 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=1696239206; 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=zbZAT+BID809NzDHo11CdyaNrShAl4KynROZBAeZ6Ho=; b=FDzSB/+B19JGo1tlvHZtf+Wy7XFarWtb+ofAawqqdwuOsG4jRzoB/0l/MWbO5bKJqtleYm ZkTmX3BrRwcZVC7/+bEtyMahrMa0QkePrYSkw6QdpDjWQzcR6JHV6vho9LRiYuMTsxauQK jS1dGpNxDkBj4+VqEAkkm4d5+Lu1d4aOx9gM2ppESEVa2sEr2ftu0fpo8n8Ja4Cl4LYwl1 UqxKUzjBw36oL7bBpuZ/rFkN5fHmYXg7q/xMSYk/6cjTphxrbSaLg2q5lJHITcETF6mYuW hmdI7E9048HsR5/BG9jL26sVwMnw/79RXchnIJ+4EBXKh9OggdZauqexzdYbDg== 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 4RzbNj5XJNz16QG; Mon, 2 Oct 2023 09:33:25 +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 3929XPgB002949; Mon, 2 Oct 2023 09:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3929XP4f002946; Mon, 2 Oct 2023 09:33:25 GMT (envelope-from git) Date: Mon, 2 Oct 2023 09:33:25 GMT Message-Id: <202310020933.3929XP4f002946@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: 45f475427d8e - stable/14 - pf: inherit v_tag values to multihomed connections 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: 45f475427d8e8e1583104350699620fc8aee8735 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=45f475427d8e8e1583104350699620fc8aee8735 commit 45f475427d8e8e1583104350699620fc8aee8735 Author: Kristof Provost AuthorDate: 2023-09-04 16:00:08 +0000 Commit: Kristof Provost CommitDate: 2023-10-02 09:32:14 +0000 pf: inherit v_tag values to multihomed connections When we create a new state for an existing SCTP association inherit the v_tag values from the original connection. MFC after: 3 weeks Sponsored by: Orange Business Services (cherry picked from commit f1cc29af84475b800df5eb94ff7d5b9484ddbdac) --- sys/netpfil/pf/pf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8958579b7e63..085ab5827e26 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5939,8 +5939,12 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action); - if (sm) + if (sm) { + /* Inherit v_tag values. */ + sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags; + sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_flags; PF_STATE_UNLOCK(sm); + } free(j, M_PFTEMP); }