From nobody Fri Oct 02 17:13:05 2026 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 4hxFjF6SpHz6vkSp for ; Fri, 02 Oct 2026 17:13:05 +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 4hxFjF5wmxz3Dfx for ; Fri, 02 Oct 2026 17:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790961185; 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=Bep6FUml1sQ5pZI7ZLvdebxISsNwH/JWBootOt0bDTo=; b=PCb2lT8AQ2a5lwOHIm/cY5+INEon1+XJJAf2iwMJMHgDbdC0NsPFWUAk7jxEeuiTnBueGt cxUceuVfD1AvjUfulEdcbvf7a/jlbBxzdPgrwY7ahYqEK7IeRxYgnyJd8JNzDUC147ewFa 4qE3Oz8by/3HGYuMYKsPYc1hwWJmfYCSnpFilQhX/do0mB3Dr0cropBs+0Xegd1i5hByC5 jsgqoFnVAGN+0j7PbpIFUBYsy/mJKSDQ48uoEqgWLA2odH8QbYFNPjeNl+vfnY/PP82xnL KyQ2En07MQ6rBg4xIDiZPEHj1ppjzyKNC8pjiR6Sd56Ch5j/T/DoTt1WqmoiQA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790961185; b=byhFuPkH6Z3RqOfPGccBLfPGnCn1XcrfU3JasE6yHFRhGhGUflM5AxSuf0SlCTsf1oFKwG KMPoCvqLx+Jj8ORsDq3WmPorbdtckF+OX8BG4vZJv3Rg4Sda2g7sFImErpq6Op+SkOSpFJ +rtayR7QxgoRMOqR38DQxWk4LQzM9uBXBI8c0D3fTYNzxnJYXjZES4UeCstJcDRGxHPXUX foJApXIzEPJ1Hp0OnJXCTVEIoRy4DoM7JlbHSOf7lg6Chdt76HqAP/u/QnGTliOj2dfwVG lIsR799g/oc82RcI8YDGoKBuPHLScFd/5p+ijA3xDJ4d3tV7zdsI/tBJbFfhYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790961185; 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=Bep6FUml1sQ5pZI7ZLvdebxISsNwH/JWBootOt0bDTo=; b=KvBfqUUBuSBRAPYdmzBPqgcQokBL3SN4eI2ji9u9E+Ir2TLDvaLoy8V3s4+yEUXtiDnJnD KJ/QTNPkYvnFPC/OKRSv4J2sctOt2KnjXjWpSXsgBxn8IM+t7kL71uwTuBum9kNCM+3jt2 9CmLnJKLhLZb1iuuK2VWctIVa+D7FfCcdnKrHPc7DwbHxSzgRbKKbJyhP3j4PmvG5HZhhY 3zm75GE4XLiCVfL/TnfC43PtmAgdMGWEEt3mqW7n8wjWZbGbSzzlGvUwN2vlcpRadIk14u G1erxySajN9D+bAI58aD32kKrQ+tm+89LhWw2Lpu8fo40cL5ssr3H9zmDDs3tg== 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 4hxFjF4zYxzRGR for ; Fri, 02 Oct 2026 17:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19a79 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Oct 2026 17:13:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 782c6ea08603 - main - pf: do not leak a source hash row lock in the netlink dump 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: 782c6ea08603a4839c2c099842df92b6159b799f Auto-Submitted: auto-generated Date: Fri, 02 Oct 2026 17:13:05 +0000 Message-Id: <6abfe621.19a79.196103f4@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=782c6ea08603a4839c2c099842df92b6159b799f commit 782c6ea08603a4839c2c099842df92b6159b799f Author: R. Christian McDonald AuthorDate: 2026-10-02 17:10:56 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-02 17:11:33 +0000 pf: do not leak a source hash row lock in the netlink dump pf_handle_get_srcnodes() returns with the lock of a source hash row held when it cannot start the message for a source node. Unlock the row there, as the other error exit of the loop does. Reviewed by: kp Approved by: kp (mentor) Fixes: 9c125336727b ("pf: convert DIOCGETSRCNODES to netlink") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60251 --- sys/netpfil/pf/pf_nl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 80d12c3abae3..3ddd2308a318 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1824,6 +1824,7 @@ pf_handle_get_srcnodes(struct nlmsghdr *hdr, struct nl_pstate *npt) LIST_FOREACH(n, &sh->nodes, entry) { if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) { + PF_HASHROW_UNLOCK(sh); nlmsg_abort(nw); return (ENOMEM); }