git: e70a2bcdc4f7 - stable/15 - pf: fix rules_counter:keepcounters test

The branch stable/15 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=e70a2bcdc4f7a3492cfe7064c2fe7398a628da52

commit e70a2bcdc4f7a3492cfe7064c2fe7398a628da52
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2025-09-17 08:12:11 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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,