From nobody Thu Oct 19 08:51:32 2023 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 4SB1fX3g11z4y8pN; Thu, 19 Oct 2023 08:51:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB1fX3Cd9z3Q8W; Thu, 19 Oct 2023 08:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705492; 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=KaH71qyDL+SvNHjguFlVyeAFO9DHPGqBZiJkzaqNXgY=; b=BrIULkzt/a+gw52UQI21OegxCwTL8MIkZbX7+m3ITbYi4DxIFJz11mnQotefU2LbkfLqNT uBlhHHYgd3Wc2CuMoKyJgABTGdTD16lDGxuSptd0QW2xTU1YuQJ7z0Og5f5RMEfZAJ6hTi udlrBvo/e0h1lPaPaxsmlURlDbMLak2E+aRmV0Xl7goXQPN3SFs/8E9WNivqhBVv+9UsEt 0zysEacGY4p7n6UnUi+G5M4qSKIzduiTru+nQL+R3SKWM/NaEKGklAD4+QdOZmE0DQnQQa cjhsdj/tH2Au7Jc0ofEt3+B7DeRBlSjzbp7dYuU5sPjOtUdYKFNoNnUhwm8HiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697705492; a=rsa-sha256; cv=none; b=PRg/QwasYkAzWdSNC1ThuFRCDrl7GMhFzOZ8lDFYSE8/+7kmzJLLkQWYepyJaJOgaVEWSL J9PSQVzkX2xjTYs03WkcwNV29TQlXxVmOjlzuugjjWqY/+diJtsaYwvpLwDcntJjBa4TKH aYvJYwlkgAufXcx2kC4zI7KN1r7FrGchMUH8h/fZT5CyxCtpU50WSjTKKDENi/5eqBoA2O ePCq+H1HQkSuINwHpF6FZXmsM258NiI9Q2loQRw/YKtxS7h33BdXTfzZbq8BOPVWo2MITJ zTiUl0Ym/Hfvg75dSg2qoOXs8teCGHt3wQdlfp89pKWCCoTzuI7E/gVhoYQ0Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705492; 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=KaH71qyDL+SvNHjguFlVyeAFO9DHPGqBZiJkzaqNXgY=; b=wNA/iCYCX1N7LY5LhYsvAWkm2BCiIpc9vLHTIuOiKJveiHlrx+bkOV4T0M5rEKXMtmXBVM E++LbSt/PrR5KcDxCqJJrRxxjhyXedCYRr3dfx44C8qfLQkVKLznLEhFsF9FAJ12mt+IfK 3HcrQBDvhY3lIs4Uqf+mNwptJGT4UMaqqafysPRVWhcmbUPh1YZJwAF8kgqra58NoUU1VK pSs0QgbhXnIWC9b8O/N2FvjTBai4CeOCYdgwKlM7DYtcnbZiF8YhFy+vR1PmYKa962j9gd 2s+DVHTyDe8/C0euNYNPlR1vMPp12b6J2wLgwkaCZEDuGZFqWKpDNv18g7WSGw== 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 4SB1fX2GKZzjr4; Thu, 19 Oct 2023 08:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J8pWhm025523; Thu, 19 Oct 2023 08:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J8pW1X025520; Thu, 19 Oct 2023 08:51:32 GMT (envelope-from git) Date: Thu, 19 Oct 2023 08:51:32 GMT Message-Id: <202310190851.39J8pW1X025520@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: 68513b4102dc - stable/14 - pf: Free pf_rule_items when state is not created 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/14 X-Git-Reftype: branch X-Git-Commit: 68513b4102dc75a9f4ca49692f97be721e407f0c Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=68513b4102dc75a9f4ca49692f97be721e407f0c commit 68513b4102dc75a9f4ca49692f97be721e407f0c Author: Kajetan Staszkiewicz AuthorDate: 2023-10-12 17:43:04 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 07:29:05 +0000 pf: Free pf_rule_items when state is not created This addresses the issues of pf_rule_times leaking in case of stateless rules and in case of state creation failures, like hitting the state limit. Reviewed by: kp MFC after: 1 week Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42169 (cherry picked from commit 4d19eceaefb7106d761bc9504bb0da737ae0d674) --- sys/netpfil/pf/pf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3dddfdd0b1a4..39d240f49dbd 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4731,6 +4731,11 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, return (action); } } else { + while ((ri = SLIST_FIRST(&match_rules))) { + SLIST_REMOVE_HEAD(&match_rules, entry); + free(ri, M_PF_RULE_ITEM); + } + uma_zfree(V_pf_state_key_z, sk); uma_zfree(V_pf_state_key_z, nk); } @@ -4776,6 +4781,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct tcphdr *th = &pd->hdr.tcp; u_int16_t mss = V_tcp_mssdflt; u_short reason, sn_reason; + struct pf_krule_item *ri; /* check maximums */ if (r->max_states && @@ -4986,6 +4992,11 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, return (PF_PASS); csfailed: + while ((ri = SLIST_FIRST(match_rules))) { + SLIST_REMOVE_HEAD(match_rules, entry); + free(ri, M_PF_RULE_ITEM); + } + uma_zfree(V_pf_state_key_z, sk); uma_zfree(V_pf_state_key_z, nk);