From nobody Mon Oct 2 09:33:26 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 4RzbNl2PRvz4vrcd; Mon, 2 Oct 2023 09:33:27 +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 4RzbNl1YzLz4SSy; Mon, 2 Oct 2023 09:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696239207; 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=GPsMaasfSX6HEswzQStMLLq8RGjd9q9P0aJeY3zxWno=; b=bS6CDafrMICL2WzYreJQ37YJX8JtGJ9/C6GDNRV9CFl/SSMymtfsUL2HK7ikxbo0oRFrQO dVMGIvIclhkYw7c8xnOXfK9Yrjp/E6X1viWdZ7LomZV80KrKBAToy+XydTNkbjtzIPNePO s7TunL3q+3aKEAij9v+RUCmYujYpNdHlRpe3h7C69VNdsjdHML7JzRIxmnxkhI/CVvzCWj 0y1pNNkkCWz5kuq6aZpBvJFm1/Hci/Ckd8pViUrhjZzbmhOQ4wdYTxHsYdQ8XK3tynAcfZ DGrM20zTT9NRhGoyConvimWAzrH31h4DyCjM9+zmdkuyVVMmfmwtN81X2KB5EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696239207; a=rsa-sha256; cv=none; b=FTzIpYxOCaU5sPYqYV3uAb6n7wgwUjgKEGqvfwf7i6aQSNO96g8MUr6juIE+oD3NzAPbhz Hx9mYeHQrDSWtkx6dBicoFS/rwh/Mk+bbGfY6sJkFU8steI9iGpMikfGqvouLY8fnh3g70 1GfC0APR7sen2iA9XAzv0wGnDkPU5y4iQ8iJKcUo9DkHCkWqHSdybcPkNseL1o57RS6yFX nUC+hjLFdlKbJgqnuZ5gawHvPxWgPfOjg8eyItRxVZXMI9v1Zm+3CWAMQDzUlGd6qlg/Eg uU570i8BCMWXc6cjjDQN1wFiQ5/pvoSWydWbhI3FRiz1xgQ3GHgJ0OzHBRZjKA== 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=1696239207; 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=GPsMaasfSX6HEswzQStMLLq8RGjd9q9P0aJeY3zxWno=; b=TZjGx9/bnkXjsxKLVb+gKYVzpyP9+GolMRiV8a7mylQYwId02o4Otxg7LT6jHGnWTZi6pG 6ungOb8/YnWeD090IGyePTV3bIs5ofGtqTtSjsKoM7CJs/YDhXosYnIrBGc82XTYuXxmSj MY4/CJVcPoMbLmgv/4Bwt/GaBa5Qu6Om5SsHvlvcQpb/wdUdz4xcfvEEG5N97shiwX0o8d OCvskoHGhuVxkpnoIN3Driyvv+bcE1QXrOjmExoH9KB4o9jXd02VcWM2tTS9AZOtKveljC x9288bc8QPoI//CPEzueBZbXrb3Q96q/VVTJtgrOudMjAwEdoESoSswqwiLKPw== 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 4RzbNk6kfZz16QH; Mon, 2 Oct 2023 09:33:26 +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 3929XQec003099; Mon, 2 Oct 2023 09:33:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3929XQtt003095; Mon, 2 Oct 2023 09:33:26 GMT (envelope-from git) Date: Mon, 2 Oct 2023 09:33:26 GMT Message-Id: <202310020933.3929XQtt003095@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: 9febb2d3576e - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 9febb2d3576e695f146a0304faff95853cc92d62 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9febb2d3576e695f146a0304faff95853cc92d62 commit 9febb2d3576e695f146a0304faff95853cc92d62 Author: Kristof Provost AuthorDate: 2023-09-04 16:00:08 +0000 Commit: Kristof Provost CommitDate: 2023-10-02 08:51:44 +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 551bfd01732f..be4fa4273972 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5361,8 +5361,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); }