From nobody Wed Oct 28 20:35:40 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 4jFJz06bVLz6x63K for ; Wed, 28 Oct 2026 20:35:40 +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 4jFJz05RDhz4QkH for ; Wed, 28 Oct 2026 20:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219740; 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=+V7GDyLprn+g1on0FUgnXIm9erVUuVaLTRFrRJtnKzs=; b=tgtCpj+4osAdq4HIxdh+py5ZAgZHJweX3e8sTkgaFIxQEwmZ2oNaf4F5tzOfwCqHfU3pkO GH5XE8oQuPxYhxKECiwxX7vsVwBKxvXiyDZ0z9j0f5tv6lWvSgC8QClL2JYrclbDFPl+mC YB6J8gUSHL30hYAqE3q14TvVce+1zbmu4+/WOz7i6PVMFGP+/Xqks2/ZAePnzwytF4UtSk eAX6vTUHuswlD6B9K7m1gx9WnDjgia445yx1L9RmVtH2CRxGFRveSyztCCuoUDEu3mvWBg OsYo4oQZBoDUFFMqaYglDIdG/tvifCpr53stGSxWxx6HVae3tpwC/xEWKs6pxQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219740; b=DbHZAnRXwqMfEzfZB9ADHM1bU1bR+xmbx+UGmvU234NYbY4G9m7IU/+cFMJur91YxLGD6e uDqrILJZrfY8Wrf0pzIJRicly6j4igzWw/iNlFPBOUjkrMTnyBPqHXjk6YgZuasFueCl7c zzEctYEKfPUKOZSMqxB9VVBJ09XQSwEuHxx9PUHm5F/PLt+W0qyB4K2QyQ68Xn+/Ea8yuh 6szYwn+zbOvL9t4XbCaGv6PF9B1GcHd+4/edwmtaENLbhToSDjqfrsCpDiaZrbty59qK9g KCJfyuMczNH2wVqc3qO+6bEV9t+H/MZVffliObQFejTz0CN17PSWNt/Ck8yJHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219740; 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=+V7GDyLprn+g1on0FUgnXIm9erVUuVaLTRFrRJtnKzs=; b=w48IyNa96B/StnQL6WGYilekKEcadA8gp5D/mlldGoa3zxjdcPJs5l2bsQMfHoqofUusIW 7ghNNRoCQtnI5ZNcoc1Ppo/iqSbQNZ+2qSr4mhdP1Bva+q3S6toMKey/yXlAVtqVbHHEM2 KcJwL5kqsP5ZgQLE2ZzUVp+YVpQUIXTpuWja8Ey1j2VxUQhf2IIG6AgjZMKGKGQPOmKSXh oTP5EN73wwvHnqpmMx9qzyXsh/ulDdHDIXSz67L+NRxNNi2Mp97HQ9bQYfm/uNZtgQx+pM 2FPi+UZPncbdtvJpk2Tx6Dlay4SfQ/wRvFXaut8mvo2f+eodV5ueEYwrm2lSnQ== 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 4jFJz055xRz1MpL for ; Wed, 28 Oct 2026 20:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d613 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 5a43befa570a - stable/15 - pf: free an unparsed rule with pf_krule_free() in pf_handle_addrule() 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: 5a43befa570a85168c7ea08e181dd83e11d6bc72 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:40 +0000 Message-Id: <6ae25c9c.1d613.18b03e78@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=5a43befa570a85168c7ea08e181dd83e11d6bc72 commit 5a43befa570a85168c7ea08e181dd83e11d6bc72 Author: R. Christian McDonald AuthorDate: 2026-09-30 23:25:48 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:03 +0000 pf: free an unparsed rule with pf_krule_free() in pf_handle_addrule() When the PFNL_CMD_ADDRULE message fails to parse, pf_handle_addrule() frees the rule with pf_free_rule(), which asserts the rules and config locks (neither is held) and releases references that pf_ioctl_addrule() has not taken yet. With INVARIANTS this panics on any parse error; without, a rule address parsed as PF_ADDR_TABLE makes pfr_detach_table() dereference NULL. Use pf_krule_free(), as the ioctl paths do. Reviewed by: kp Approved by: kp (mentor) Fixes: e249f5daa41f ("pf: fix memory leak on rule add parse failure") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60104 (cherry picked from commit be7e57fbf9729abdc14c9cb37a127c6a3fa95e27) --- sys/netpfil/pf/pf_nl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index b8655297f782..cfed37fdba80 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -796,7 +796,7 @@ pf_handle_addrule(struct nlmsghdr *hdr, struct nl_pstate *npt) error = nl_parse_nlmsg(hdr, &addrule_parser, npt, &attrs); if (error != 0) { - pf_free_rule(attrs.rule); + pf_krule_free(attrs.rule); return (error); }