From nobody Wed Sep 30 23:31:22 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 4hwBBg55DTz6tSGq for ; Wed, 30 Sep 2026 23:31:23 +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 4hwBBg3MP5z4Kmq for ; Wed, 30 Sep 2026 23:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790811083; 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=tYeN6Z6uJOKc/IWokq4lBZM31jC4iZ2HDdMWiReuxjM=; b=CU3RjTkgRT4IyFqadvuCGhsNdMBQHZrVZXOiJ7oP9+9oTNH179ZZmtTAu6ZlGVoR/Ndmff 2hqNrP1cZAl6T1AKWHxu7ViTO9Ztv6I1A07hWFXo0wWfOaZAXzweTnOyJu4Q+Ndqk43qJJ 7KEVAaJtt+Y4Y2QBUai1guuIZVKbUN/3Qqnsp07wGDkrktcsw8amsb86GW04EscVmQMf0i tF2GHeNHqPqgKvTCjj1kg9xcu4DSY4RiywAPjk623WsrVMlOtPSNfjdeFzj6hkdFMVxNk3 q1iuWIie3ZdMSGNlUdIl3cCe4OgE594r1vRgjPj4MV8eo2G9G0P0J6MqoVYKFg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790811083; b=RnSiPh4W7ZvNvv/0ueHBDB/olfYrzuyxtlIXNx/NZtTZkAPG2dCxxv9+fdeA9erinT65q7 UUoUKmHMN/hNPf4Jn+Ez+9VtS1CfudCk0EErXf2j2fHP2mbkdst7mNJOE9NFGZkBCU5ao2 yDPrMxceOuqRnCIz/EtI3wrljYAbHu7kUw2oin33D7rOLUhz4UTd/I1tESBwjyPfMFYh6r KWdmLzRQQKcWgoi8fZKUto5ojIJIGrQtajCKKLooGf4HeCbVr6g0LdoUZcFnCaRNInkea7 3M493v/T/2ZygJHUZAftAx2BNpgdAN1ZQAV1WVPkSzmN0B/tWfOgDWv7DGbPGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790811083; 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=tYeN6Z6uJOKc/IWokq4lBZM31jC4iZ2HDdMWiReuxjM=; b=o9j7GAsfAdkhEdVKZ1VUJmKQtqSiqGAaqpvb8Q+oIcSdhe+ocW0Ek7WhbQAWbDpK1j8Kon 01yHYpkVL8UExHLRLz1U1eaGAFdkoxmJNH9IT4UjtMHHLz31sgwzbU9cQSSb3TSKaiPdyf wD9t5aJuOXChRJwwnihC9N8g51a7Nr5lRAHUeN+TsdLBGu2SiAvA0hxlch4R1ieUnhu0C0 tmlsEWUyux6sEVKopOjr5FQBvzJQX5p/Wo6mC4telJqzG6ap3p7rjonbxfGLjmdL4Lg1eH utN1/I/6ezNHSw8Zsr/R7F7x1TDH6AwtI+rPuqGjizF3g5pE1EwnR8dKoyeQgg== 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 4hwBBf2TCWz160X for ; Wed, 30 Sep 2026 23:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4530f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 23:31:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: be7e57fbf972 - main - pf: free an unparsed rule with pf_krule_free() in pf_handle_addrule() 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: be7e57fbf9729abdc14c9cb37a127c6a3fa95e27 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 23:31:22 +0000 Message-Id: <6abd9bca.4530f.4f8bb32e@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=be7e57fbf9729abdc14c9cb37a127c6a3fa95e27 commit be7e57fbf9729abdc14c9cb37a127c6a3fa95e27 Author: R. Christian McDonald AuthorDate: 2026-09-30 23:25:48 +0000 Commit: R. Christian McDonald CommitDate: 2026-09-30 23:25:48 +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 --- 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 6281b2d0ad19..8d06798065ad 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -847,7 +847,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); }