From nobody Wed Oct 28 20:35:55 2026 X-Original-To: dev-commits-src-branches@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 4jFJzL0JFWz6x666 for ; Wed, 28 Oct 2026 20:35:58 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFJzK31RVz4RJf for ; Wed, 28 Oct 2026 20:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219757; 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=HI/VL+RsoO/ozZxBpO5jvOW2c9FMbtF2K4wd7B9DoB8=; b=ACXvx7KSi0lRpm09/ETft4sGtSxmZisk52BEMPuz3g0Gai1S3919DW8Rru8Avtmjmutt1s Q4CMGUmvPPw6rTkZOdq1jcQTRpds9khqEv6lH/7Zn9Jlvv6z41IzVXDSpmslSsn1HOpifz crSzV3KktRWWIZLNnEi7M+q2gYmdN36FOp8GBXA2XKCVI1kvsIUnayQVdwHWUxl0TaQ490 tFvKcNuOK/1JomGoUIEIk0Ni1mJWCRBhXx5NRA0Wnquq5jKSaOu+HjfZWc6nUUHsierh85 yxhhJ6LDYYuEMDcQ6UtUQavUpBMQrPWvaldFMH9RVHklPnQa5ZkrHYMEoHaD7Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219757; b=mk+NoIvrmGch7f0V73Tk5o2CSQLRWXsUxM7OpMN7T1fx2yiSESxNIBZhHyQjSbalQkrKbe MO2NtZ3P8q+Y6EHLhfqWdu7vtlqusENf9ULoOv/cQ3b0B3v7pnkrYpIjwTa/rBw/yQskeN rlXU75TceIz0xu7kg+bhWhWbB5+nB9EycZk1Y9syTEAojt1KjO8y7/slqD4V9V3cQLjRg+ a95iPggHZ9IRM6Br/kCm2jLXHDVDnBRpdyOr9TBqfL5Ne/YnLvzL8izBkbIkEbe+D98ASs paPCassRAPGSl5gXS08HdqUpOagWoNSlMlsPolRqN0PwMDClwtAimWt6Uu+fWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219757; 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=HI/VL+RsoO/ozZxBpO5jvOW2c9FMbtF2K4wd7B9DoB8=; b=RhGT0oINUpLSQug/EuLXRjLe3M9vzFIyAsVeh2jym4hiL3trt3r1WG4i+KGb9eZeFG09TX 6N9LrJyu/gfWUhAqzxjiEAdJPN4EWvzSzry7K3eqsOAn4pSR/lnQk1PftdfJsQPP1aD1Eo NiSJubBRlthU5cgWgjSZr2ggbba/sGIZAEDiz7aUsj6tUVxUQOMEE6/ASFfrmA7OV0nZv1 0SNKe1eWXNyyJfM7h4mk5pDheX5ZQLgnIXwRFyHxvvQpzIuq4u6VbbHI7TSGA+tqx4JFDc Oz7UmZRwh7fD03gqWWHdrBokVA1TZAdiWbkCYN3QQOq7dkOyGX83YOlMBPmx9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFJzH0QcVz1Mv5 for ; Wed, 28 Oct 2026 20:35:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e19f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 6bbbf0f0d870 - stable/15 - pf: Set the reassembly flags under the rules lock List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6bbbf0f0d8707da5a0451a391491f1aee8e64730 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:55 +0000 Message-Id: <6ae25cab.1e19f.3ddf935e@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=6bbbf0f0d8707da5a0451a391491f1aee8e64730 commit 6bbbf0f0d8707da5a0451a391491f1aee8e64730 Author: R. Christian McDonald AuthorDate: 2026-10-13 13:39:30 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:13 +0000 pf: Set the reassembly flags under the rules lock DIOCSETREASS stored V_pf_status.reass twice with no lock, first the flags it was given and then, if reassembly was not among them, zero. pf_normalize_ip() and pf_normalize_ip6() read the flags with the rules lock held for reading, so a packet could see the intermediate value. Compute the flags first and store them once, with the rules lock held for writing, as DIOCSETDEBUG and DIOCSETHOSTID do. Reviewed by: kp Fixes: 39282ef356db ("pf: backport OpenBSD syntax of "scrub" option for "match" and "pass" rules") MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60531 (cherry picked from commit b951994eddd4d274514df751da06680a32139037) --- sys/netpfil/pf/pf_ioctl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 3040814165a7..8986a6a20222 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5843,12 +5843,16 @@ DIOCCHANGEADDR_error: case DIOCSETREASS: { u_int32_t *reass = (u_int32_t *)addr; + u_int32_t flags; - V_pf_status.reass = *reass & (PF_REASS_ENABLED|PF_REASS_NODF); + flags = *reass & (PF_REASS_ENABLED|PF_REASS_NODF); /* Removal of DF flag without reassembly enabled is not a * valid combination. Disable reassembly in such case. */ - if (!(V_pf_status.reass & PF_REASS_ENABLED)) - V_pf_status.reass = 0; + if (!(flags & PF_REASS_ENABLED)) + flags = 0; + PF_RULES_WLOCK(); + V_pf_status.reass = flags; + PF_RULES_WUNLOCK(); break; }