From nobody Thu Sep 7 17:05:32 2023 X-Original-To: dev-commits-src-main@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 4RhQbx3h2Vz4s1lq; Thu, 7 Sep 2023 17:05:33 +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 4RhQbx1n3gz4Ds7; Thu, 7 Sep 2023 17:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106333; 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=zLqSWxUBxoFo0jW4a9a7qoQQLK1AvpaTlz5LoO3K10g=; b=cJ4hkjNekyEjpKP7iSjQ5Z3LC76MhTCQ+WqhPD8mGAKAlsP5kz1ZPO8ZU3YuPFxOgeK9Sd VIT3h6edPGTYGM7chh8Q4BiJdmp16jdGQWeEZjVWR5CaASbOXG2+SDmHtTUzcjLhNoUriR 0MCOjWEfOGjxbEROeRT0uwr1E0HiNkFuJ++BlBrEaqVYXY/QRjhi45fM9+PADG86lK+A9P l5NB0gj0DjIdnZfR7nbgz0chP3kzA7FQm0lSXLqabFclAMLEeflwb8W5y6eYxBmkWi5gln C0HcKVg3CmMDLdBy3p4gPoFaFEgfMW/+dGUYH73vrE6VEfmuylt2JWqUW9VuJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106333; a=rsa-sha256; cv=none; b=nfAxhny8AmIa8SSZSkH9viOLJmJwG4Xq+s2Zor/5fBKnY5QEW1mGatO0iHOySyjbwSoz1S kiPIDE2j2sFGNfZVD+QObKrfXbbiZ+o5W3vayDF41aWpncJVTFeDENrDjHfISLp60eTjK/ gyYUhWXF8zBLEXIez1nvx6Ip6Mg6eew21bb5CWqyZOXsu2C56uLxW2GdMM4B1gmJ7jYVpf pfcjCwX2Q5tJVk94A0MFBRMsS/4Jb9FJtqGjIdaAUY67GgPD6pIMFN/Rplhr6gn0k+sbx5 Z3cuQm1ntKsEnzKIyd5p7v2z8g68iIOsXwkTW4ExJ592NqAkbmtw1aReRAiwKw== 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=1694106333; 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=zLqSWxUBxoFo0jW4a9a7qoQQLK1AvpaTlz5LoO3K10g=; b=QD+LJ4cPAOGfcePUFnHSUaIRgHxYJwjAfafEz6HrZnDQtm5VdVNVbGi43ad5u9NcgZ7M3U 3V3a0ENmzIrobx+0HZmSVEeEXm8omSgsewypH6BUeJJvL9e+y2MA0cmS0U0V/C184e5Z6l W/m7ho4IEQrFvQG6e9Q0lk67q3IUC7ljfnz5PIEXT+R2IfcA3ahtuxFAUeDxMLx0j4cwey +wSYS+z9FtgK54ld5kGODHVTSPfJKumKmCZFZiGH6O+HEFKBqRDvoc1+dZciyikZgjjwUS aSaw3wbMHG1HMwe0NyW0Lvs4738jgx8/H7q31TTC65/CsnJ7GtcOEneRP5iUag== 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 4RhQbx04fYz16JX; Thu, 7 Sep 2023 17:05:33 +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 387H5Wvn032523; Thu, 7 Sep 2023 17:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5WmZ032520; Thu, 7 Sep 2023 17:05:32 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:32 GMT Message-Id: <202309071705.387H5WmZ032520@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: f1cc29af8447 - main - pf: inherit v_tag values to multihomed connections List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f1cc29af84475b800df5eb94ff7d5b9484ddbdac Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1cc29af84475b800df5eb94ff7d5b9484ddbdac commit f1cc29af84475b800df5eb94ff7d5b9484ddbdac Author: Kristof Provost AuthorDate: 2023-09-04 16:00:08 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:01 +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 --- 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 c24d4dfce742..5667cb422bbb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5947,8 +5947,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); }