From nobody Wed Oct 28 20:35:45 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 4jFJz53p5Nz6x67y for ; Wed, 28 Oct 2026 20:35:45 +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 4jFJz51Gsvz4R78 for ; Wed, 28 Oct 2026 20:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219745; 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=Toup/M5mPATY3yMy8sfq1+c29/kiPTFCrX6Z2sr8qkE=; b=hpO1mBsLvz59fb8ZxmCehxk6ywd635SmR1zJx1v3Uutp/vU+NW9bgqMj+PzpmkzAFA2fNi j6e6lgrpm92lS++6CMA5eNKOsK0yloP0h4mXcTnfmQ5Ek1XmqK5dmANI+r9IX/6d92dQCi 0GdkaoOWtiHZowqUbBQ6V10UBj+nc0C9nzLhchSzHk+MWUuxpbGSdpXut5d5PWK15Ww/xY lLyz4kCz9PAnD6jZQXyXzQxR0xH1yVfONSfKDvCE4UmdoOioo6vrIRqNjMVFpDa/NnIXjy aB5kaihaAiT8hgY+XrNacvNSNeOnXFZJX79994Yd6JuNSY1ynnFLqM2kI7CEkA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219745; b=GZedE5JwXpRnMhy9Y7fMvVZl8b3tRymJml3xUkHyRh2bE5ygMOe2m1BRJjhsoawoKUaaHm 6i1fuVCGkH5ksv28YlnNRC0CnAGtTVAfmvUzeaanY6CHRp8vRG0PfdI4uIDF/o16IrT/5d V+YAg7sV+fFnr0C91JqWGJ7E6mMoqo1vEUb++3Pfy5KJEy9M9n3szliUSIY7fNp8wjfEkc vo0O/Xi+5gw5yfXSFGti72zWUbixLLva9eHdENrDhk6SRdFAPsMQBF+BwuNFIK45w8y1EZ UEHi+MUlVi39qWgGyd6lsZDx2dXoE5e7TYHKS4GRpmk4GM5b/dJvPvih/5y7nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219745; 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=Toup/M5mPATY3yMy8sfq1+c29/kiPTFCrX6Z2sr8qkE=; b=XgEetbHzxdKPLlbO8GK+A9e7CjkLJPOwPpdgqq8oJRDRbdFIVZyf99tZNmqigrXDa5VBao CLOhbtujW2APE7zFhm42owrAHG3SYDg4HV6dPXkfZYklaA/HRY/DlfPmovWyCjfEa0gutD 84NGlOhHz1ffJDRZSKVac6jFhIbENgnZJ1ifk5XbRaHI0j72Wb53rHU3qpuPm8hklrw9Pj 3p/UCwWbH1KNhDBTQPF3xjkXQZcrGdtQi719dsk0ewnAgFoHxNylHz6ysLc9m6KnjRsBal MltKf2grAL+FEukz/ApyuyIHv8DqBtfCnSxgkAH7qwxbuu6cnmFEBe6N2vb+HA== 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 4jFJz50t0Dz1MpM for ; Wed, 28 Oct 2026 20:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d214 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: c9547537ae4b - stable/15 - pf: do not leak a source hash row lock in the netlink dump 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: c9547537ae4bd03a804f11efd61ee0c1ef127e4e Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:45 +0000 Message-Id: <6ae25ca1.1d214.124366d0@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=c9547537ae4bd03a804f11efd61ee0c1ef127e4e commit c9547537ae4bd03a804f11efd61ee0c1ef127e4e Author: R. Christian McDonald AuthorDate: 2026-10-02 17:10:56 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:06 +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 (cherry picked from commit 782c6ea08603a4839c2c099842df92b6159b799f) --- 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 d0c10a165969..4c33fbd7bc37 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1763,6 +1763,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); }