From nobody Tue Sep 2 21:10:57 2025 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 4cGdh171RQz65Rwf; Tue, 02 Sep 2025 21:10:57 +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 4cGdh144x6z424w; Tue, 02 Sep 2025 21:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847457; 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=FggT3cldPKzgMuT5CiW2O9Nhw8msDj3v1vF0Fewinfk=; b=xDez0PlEoszrbasYEsKlrb++OEl7OGyJct+iq4Yt5QYiCMMrwfy/kptLIuZlSMsTMJA8oP zi0EjQ8pP5oCcjIwWxwl0zo460VQ0WwPREqDwQayQHMWO5GABh4FCgU8fgvf8tzptjBZ0i dpg/GiQDSqlXx4KfztLggFCcogL7OnVdCsSvPMT0q31WJUXwhcdykEwytlE58xEGXpo8IE hS+D0fxX/bmpSyO6KaXFbIZ7Z5dQw4lrkai0w7w4fZTFR54GGoDW4JJykurugX+ZtEPbav J/aZE/VrBYDlHSiTeOE5SMAamqxUSe/v8wi/WRoLRy/YPHjfRVJw7Vi8htA+wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756847457; 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=FggT3cldPKzgMuT5CiW2O9Nhw8msDj3v1vF0Fewinfk=; b=gK7cvuLedwLvGAW8jRRNXUZC1tk0QjcTStaA7eAH7F/veIlSVF2mNLL5p6wCCMO9MpWRup 7WknsjG4+isfyZ2SoDnAOPnAt9auiLS3oaNPnzcJfLzVJWq9OLGVa8QB9soecyPaPA6yx3 oS+aPer9QmJ2m1w52wzT3jgKyR8iZtwubLZ12mDMiL7VJc0Qln0cIENf6Cld7OUcjFNuYy UkM8iGy6yaGyW9T11uEZqFxWDTcDh9kMyAKqTAX7u36w/8x3KGVqHw/lR5x4c+dtN160CL YCdkW4xtdxcPS+AgKMJvcFzW8ENJmLDKVVIYGVVdknjLZ8g6xg99Slo5eplavA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756847457; a=rsa-sha256; cv=none; b=woi/SJC1kCL6Q4QVSBYEXYnLZjeXjooep5XjJd2/r40+kJSQogsMJAYDDjXf/iIGe1DL0e nfxrNht19ZUUGjXyy/bI53okzVsJXyfjyMKXqFqPxdyFxXBAfE5ndAI0plr4K1mAprs+ah lTvZTtC+f2fKTQE5BeSsjSgWsk+3lRiC+kdZHOTv1uwbqiMo+z7uX+cf5+BaDYQYj6q+p3 cqvTwMfh/qcenwx3Xe2gr6vT6Ke7lj6c/F9O8V/4EqrvLtMW2JMS5/zZgX13UvRi5/rRDi 1KNq8QM7/qLEpXiS/xkC4baDNdbAyLT1gPiUbFWO2AnckKB+dsfnSyxAS4KTEA== 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 4cGdh13gbrz130b; Tue, 02 Sep 2025 21:10:57 +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 582LAv4L036593; Tue, 2 Sep 2025 21:10:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582LAvR6036590; Tue, 2 Sep 2025 21:10:57 GMT (envelope-from git) Date: Tue, 2 Sep 2025 21:10:57 GMT Message-Id: <202509022110.582LAvR6036590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 44cc3b273191 - main - pf: free struct pf_krule_global with pf_rule_tree_free() 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 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/main X-Git-Reftype: branch X-Git-Commit: 44cc3b2731914f94851c0e468a5fa07c5f6ca006 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=44cc3b2731914f94851c0e468a5fa07c5f6ca006 commit 44cc3b2731914f94851c0e468a5fa07c5f6ca006 Author: Kristof Provost AuthorDate: 2025-08-29 16:13:31 +0000 Commit: Kristof Provost CommitDate: 2025-09-02 21:10:21 +0000 pf: free struct pf_krule_global with pf_rule_tree_free() Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 9ca7c6759e27..934eff020074 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1212,7 +1212,7 @@ pf_begin_rules(u_int32_t *ticket, int rs_num, const char *anchor) return (ENOMEM); rs = pf_find_or_create_kruleset(anchor); if (rs == NULL) { - free(tree, M_PF); + pf_rule_tree_free(tree); return (EINVAL); } pf_rule_tree_free(rs->rules[rs_num].inactive.tree); @@ -1433,7 +1433,7 @@ pf_commit_rules(u_int32_t ticket, int rs_num, char *anchor) rs->rules[rs_num].inactive.rcount = 0; rs->rules[rs_num].inactive.open = 0; pf_remove_if_empty_kruleset(rs); - free(old_tree, M_PF); + pf_rule_tree_free(old_tree); return (0); }