From nobody Tue Oct 13 13:40:24 2026 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 4j3wSs6Vdbz6vH19 for ; Tue, 13 Oct 2026 13:40:29 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j3wSs58g6z3Hc4 for ; Tue, 13 Oct 2026 13:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791898829; 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=rAF4VoNKKHzFx3kyTkrMX/qJ6jBDBup439ye98wduT4=; b=XF2sQVYUi8QTTNobCq6YT3qaKZIDUZ5INeQTekenXDTg0+g5ZL2Vgx3s4dFpcdgsJGVc4P w+zc+7wpA2IcgdP3Fx3atDwfnX83gdJkWtDidwKJpRO3jqGHpzn0oh1MwWcWrBXXYMRV1a wAVxbPEmkU+rzyEKYYtFVKp9vBF6nQ6R8P84IDmaqB9P7kIi3/p+HVfzUgxA1jhIe090ng am6yByTta/6Q3ve8ptP49A2dn8A4ufBdX3OUDpaIP5cx4sC9b25cRzKJ3xyB+Cw4eyDSIO N3y2Ggxmui+hQcOnSm2HzUapo8y7F1KlG1Z1eyu8ae+7bBqbzI75+Wa5rnQjcg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791898829; b=hJo9tHStW0E+9nKRMviSc4fLQEWjywrec4VgauVB2tcjzRi+wMxXUPZubJQHYbgJvx/BzX bLLobE6Y1EVnF2FSUER6krCwPlSv4GvmSv26LRpDqiZPhiUu+ZGFQPy1QQYboWy9l7DrCN WK/Tf+8bmBfU47rpA4JENept0czxuGO5BMsAt8oKs5LIFZrVEzH6oPy1IxC81sYAunYCzh 5+3VkBw2ySfertEDXkgiWXjCDYMtGf/4VMw7Z0uHUVnf16TvRDkq4SZkdVvdbA245spnB0 rsmzEs4Q5HM5JrUi4KnsXykiAOdaRFMr2u57pkHrVmQZ1cJ4IypQk+JKQ11j2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791898829; 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=rAF4VoNKKHzFx3kyTkrMX/qJ6jBDBup439ye98wduT4=; b=CkJUB2QQtstzTkqVgjm85v0mYWhR8D0mLIi5+0O9YGI/NOtnaJVzayBXhePm67SNubhfUe 10VhSnUH+3TnBgxSKEPeiUZBeL2bWQr4Q20gUZb9q5H3Sk59vjOwrLhGPnrDJPeKxAYn1j wRxuJTrODn1mPkbt+TUxubXtP0/ez1/m4+FyjE2/7oHC6J4NT6Za34MnT+shfO6AKPpIWH dYJCelsNM6j1Q0e+rgyediDsgfIO01htCRtfbPEs3pBtHwWfMDtDO2nBeWXk3udhJYNX/h Qn+ly9BJ91yHd3mvDZ/vwIStPL2X/zAin4GzSqiL16DkAwy20dfDddi5cp/kyg== 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 4j3wSs48tjzGpl for ; Tue, 13 Oct 2026 13:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44532 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 13:40:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: b951994eddd4 - main - pf: Set the reassembly flags under the rules lock List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/main X-Git-Reftype: branch X-Git-Commit: b951994eddd4d274514df751da06680a32139037 Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 13:40:24 +0000 Message-Id: <6ace34c8.44532.21ac2471@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=b951994eddd4d274514df751da06680a32139037 commit b951994eddd4d274514df751da06680a32139037 Author: R. Christian McDonald AuthorDate: 2026-10-13 13:39:30 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-13 13:39:30 +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 --- 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 095d357b5ef5..f673d3b4cf1e 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6627,12 +6627,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; }