From nobody Wed Sep 24 13:41:04 2025 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 4cWyfn1GbZz67rTr; Wed, 24 Sep 2025 13:41: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWyfm5VyCz3c9x; Wed, 24 Sep 2025 13:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758721264; 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=Kh6zyctfv/hjx4GPfuVQhPF8MusDb8rtGRHrhCLU+YA=; b=yowjlTIASywivIkJe6voTyx8dQVFyLvTOf6x46uLSXwr+4aL6pSbaoRvB8C9rPGrKhQaxa sWXbya/UEytirCZgXWTSNPhDE0GdPFFuubVG+xZ+WyBMgt1zVWtbzuwfrJY9EYufDuhOws EW788DaTIy9W18w1LjThz8MGhLLXC7ngIMF5j18+KcJ9OyGTxD2Ss3BaHLZOacHytBACAw GECrNZGyB7h/aEsSoUeTGTAcTv61Jj5YgYcE8OZR56mj715ul/h/0dXYzV7k2auoE215SK 5XFsB9FqG5TkJ80mxYLiMczPDuL3NWWm47jnxZ4yirYAVxwfjDQmuVsDhCJ1oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758721264; 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=Kh6zyctfv/hjx4GPfuVQhPF8MusDb8rtGRHrhCLU+YA=; b=vPIyBiEz7us5HAyRqincCJZsJaFLGoGFd16NnQVNf1XfkEhQ2QQPFTW4tC3g0O69Df7IJ8 bNubK7FP2r+NuYidkQ1spxEf/XcX57RRSPpmmedwjq0PmEuW5tL9hDfhkJVy45HuOMVCw6 OSK4gqcL9aIGMeJR3t2QsPl+DW9LfxEj62EMWvMpJVehfgPvtX6zpV5gMRqoJ+MsrYRrNr HZ+epotvFOtcF5WvgzdidNlqyHirToxe+mPPjsgmLuBUhb036RPyzBwnrrxZhMcYw+I5FW 7IaIeZ7a3ifLw7TAFqUVIl/Dzl2bEEtA3cytCZ8QZJyNO0bhHjtQ0vv4wOAPxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758721264; a=rsa-sha256; cv=none; b=aB2wIDykcnr7wR9tzsTFQA1+wveWUNTXebMkQEPPXJs+Av4ZY/rwjTSS7SQltAMmUFYeOF 89DUVNWCH0j5oFQyEsZ2hEkmh7gNfeRwljzuDFpDz/X0t7JmAJO/lJO5DcITlNCNYQ5MBK KJAQOddYqVdowrn+VJPQM1h9/l55MS1ag3JlG8PcB+TorMOBRXxKyxq8yICy8M2gjnhX/Q x8UYAykv1qRW2jOyEiBY1RNOsM+M6o/oNoqLLnsKpd5D40hbU/WLQxqQCmztt37ICNbNr1 qUkfBK2rlXqmXRZkOgmmbJnms6JUPA37N5I42t512VyJuMNfgtElPCmeI9bRMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cWyfm4xq7zZHj; Wed, 24 Sep 2025 13:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58ODf4EI005208; Wed, 24 Sep 2025 13:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ODf4kT005204; Wed, 24 Sep 2025 13:41:04 GMT (envelope-from git) Date: Wed, 24 Sep 2025 13:41:04 GMT Message-Id: <202509241341.58ODf4kT005204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: e70a2bcdc4f7 - stable/15 - pf: fix rules_counter:keepcounters test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e70a2bcdc4f7a3492cfe7064c2fe7398a628da52 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e70a2bcdc4f7a3492cfe7064c2fe7398a628da52 commit e70a2bcdc4f7a3492cfe7064c2fe7398a628da52 Author: Kristof Provost AuthorDate: 2025-09-17 08:12:11 +0000 Commit: Kristof Provost CommitDate: 2025-09-24 13:32:11 +0000 pf: fix rules_counter:keepcounters test The previous pf_krule_global leak fix was a bit too aggressive and cleaned up the inactive tree pointer before we needed it to preserve counters. Only clean up anchors that are entirely unused. Clean up pf_main_ruleset on pf shutdown. PR: 289299 MFC after: 1 week Fixes: 275ff85b25 ("pf: fix struct pf_krule_global leak") Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit e63534edbcd050215bc109cd89a31ba30c5ea850) --- sys/netpfil/pf/pf_ioctl.c | 5 +++++ sys/netpfil/pf/pf_ruleset.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 06c40a03f575..c7aa3e1822e7 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6547,6 +6547,11 @@ shutdown_pf(void) pf_kill_srcnodes(NULL); + for (int i = 0; i < PF_RULESET_MAX; i++) { + pf_rule_tree_free(pf_main_ruleset.rules[i].active.tree); + pf_rule_tree_free(pf_main_ruleset.rules[i].inactive.tree); + } + /* status does not use malloced mem so no need to cleanup */ /* fingerprints and interfaces have their own cleanup code */ } while(0); diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c index 1711e690f6bb..4e16eaa76f9d 100644 --- a/sys/netpfil/pf/pf_ruleset.c +++ b/sys/netpfil/pf/pf_ruleset.c @@ -336,12 +336,6 @@ pf_remove_if_empty_kruleset(struct pf_kruleset *ruleset) int i; while (ruleset != NULL) { - for (int i = 0; i < PF_RULESET_MAX; i++) { - pf_rule_tree_free(ruleset->rules[i].active.tree); - ruleset->rules[i].active.tree = NULL; - pf_rule_tree_free(ruleset->rules[i].inactive.tree); - ruleset->rules[i].inactive.tree = NULL; - } if (ruleset == &pf_main_ruleset || !RB_EMPTY(&ruleset->anchor->children) || ruleset->anchor->refcnt > 0 || ruleset->tables > 0 || @@ -352,6 +346,12 @@ pf_remove_if_empty_kruleset(struct pf_kruleset *ruleset) !TAILQ_EMPTY(ruleset->rules[i].inactive.ptr) || ruleset->rules[i].inactive.open) return; + for (int i = 0; i < PF_RULESET_MAX; i++) { + pf_rule_tree_free(ruleset->rules[i].active.tree); + ruleset->rules[i].active.tree = NULL; + pf_rule_tree_free(ruleset->rules[i].inactive.tree); + ruleset->rules[i].inactive.tree = NULL; + } RB_REMOVE(pf_kanchor_global, &V_pf_anchors, ruleset->anchor); if ((parent = ruleset->anchor->parent) != NULL) RB_REMOVE(pf_kanchor_node, &parent->children,