From nobody Wed Dec 06 14:41:32 2023 X-Original-To: dev-commits-src-branches@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 4Slg8D3nfVz53XBB; Wed, 6 Dec 2023 14:41: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 4Slg8D3J7Fz4JMm; Wed, 6 Dec 2023 14:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701873692; 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=fUuWrVTFgTzRP5U3seyr6LbvHObzPO40T/zkqnx1w6U=; b=k+zvxIbatPDkFTwvBRUZ6r5XDDtfZniD2gByLOz8h0xKDLzzHD2XC3I5N+r8ZJ7UQrmhWB 8k6WA7+sO1Uir1TZ4AXJXth45NgNhNu5ZVaZwUCy92DSqgze6Hg0yUOwDICP7CMLuSL3zp mg5J3ubWzEwd0y7Quzrf4J7Eq6jr5xyLPhSVyCTtHqGVtxNwT7DN8dzki9jNHe3BjiOMN2 peDncQJ7f4MP/S1VKvpaM1td5N7zd3ihuLlNBVFXetzKTxfjEVfk4sfaDGTIzv6X55yutT bkaYOcxN9Zw6pbQgVMGHH53Cu9Uj7wmZmmWtO1V+Eozxdiui1DMp5k6NTTNeEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701873692; a=rsa-sha256; cv=none; b=cSkCqHbUTpkz8M07PnTlFKAbwDrndsUlDNlyT70E3SAlv7c41KlSyKVEd7STBHDi11mS0Y h0vLZ/f/kkHq7ECXoz3U6nntCsHqWlla1LUjixV5sJqLksPCqo1C4Byn+w+Q0MTouJKy/X 6Teqo9FEo5gB64uH6xWjxaHDf3tQG537OyeynEX79EujtW+RNY+dWLvj0qUYALOlPcZlAa vMsGdkWkVuGDQ+C2urBU1QPWohsi4a/vt4w0cuqApeS94cN7ASgCtH3mPLcO1V4xSF2loB HftoOKxuEtAKhKhfVi8fXmihuf//MmiucnQ/7mfA35Tdp1rzIkwHmIyjitwPGg== 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=1701873692; 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=fUuWrVTFgTzRP5U3seyr6LbvHObzPO40T/zkqnx1w6U=; b=Xzqvh5MniePjjivBufYGs1aLKIUa5PoXej097GsrkOZiNM+mOhOKq/VEOKxUrKeVwtUh7G dYcC/A1FXhrnK/Vc2SWecNSrf5ZAewXD3LLWeb/jutFrilKHtIGbIky9IvyKFeFmG5sqsW 2zUNm3bAkdl+6MeRo+Kgw1WTLGOs4YnNvBDa+rFsPNn/ybPQWd+dNP3IddgREQp1DZdy20 N30RAY8IAuZ+Hpd1wZomqVBylI/2Jho0MAQNNf+spppJrbEWany+KSlORb0I6tN6LPS/Sx vH6AtXqy8YB/j2xsDfkIedr7JpC01FHqz5TcuM+mntAeSVztE5KYFspTBEbwJA== 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 4Slg8D2NHHzx02; Wed, 6 Dec 2023 14:41: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 3B6EfWMS045733; Wed, 6 Dec 2023 14:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6EfW1P045730; Wed, 6 Dec 2023 14:41:32 GMT (envelope-from git) Date: Wed, 6 Dec 2023 14:41:32 GMT Message-Id: <202312061441.3B6EfW1P045730@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: 05c55eed44e5 - stable/13 - pf: fix mem leaks upon vnet destroy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 05c55eed44e53a3a5473451d105f81ce36ef375a Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=05c55eed44e53a3a5473451d105f81ce36ef375a commit 05c55eed44e53a3a5473451d105f81ce36ef375a Author: Igor Ostapenko AuthorDate: 2023-11-29 12:35:41 +0000 Commit: Kristof Provost CommitDate: 2023-12-06 13:23:33 +0000 pf: fix mem leaks upon vnet destroy Add missing cleanup actions: - remove user defined anchor rulesets - remove user defined ether anchor rulesets - remove tables linked to user defined anchors - deal with wildcard anchor peculiarities to get them removed correctly PR: 274310 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42747 (cherry picked from commit 0626d30e41cba64b41667314c3a4f7611f0eb685) --- sys/netpfil/pf/pf_ioctl.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 639c2462fe75..81b766cb7f6a 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5089,6 +5089,7 @@ pf_clear_tables(void) int error; bzero(&io, sizeof(io)); + io.pfrio_flags |= PFR_FLAG_ALLRSETS; error = pfr_clr_tables(&io.pfrio_table, &io.pfrio_ndel, io.pfrio_flags); @@ -5499,8 +5500,34 @@ shutdown_pf(void) int error = 0; u_int32_t t[5]; char nn = '\0'; + struct pf_kanchor *anchor; + int rs_num; do { + /* Unlink rules of all user defined anchors */ + RB_FOREACH(anchor, pf_kanchor_global, &V_pf_anchors) { + /* Wildcard based anchors may not have a respective + * explicit anchor rule or they may be left empty + * without rules. It leads to anchor.refcnt=0, and the + * rest of the logic does not expect it. */ + if (anchor->refcnt == 0) + anchor->refcnt = 1; + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + if ((error = pf_begin_rules(&t[rs_num], rs_num, + anchor->path)) != 0) { + DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: " + "anchor.path=%s rs_num=%d\n", + anchor->path, rs_num)); + goto error; /* XXX: rollback? */ + } + } + for (rs_num = 0; rs_num < PF_RULESET_MAX; ++rs_num) { + error = pf_commit_rules(t[rs_num], rs_num, + anchor->path); + MPASS(error == 0); + } + } + if ((error = pf_begin_rules(&t[0], PF_RULESET_SCRUB, &nn)) != 0) { DPFPRINTF(PF_DEBUG_MISC, ("shutdown_pf: SCRUB\n")); @@ -5527,12 +5554,16 @@ shutdown_pf(void) break; /* XXX: rollback? */ } - /* XXX: these should always succeed here */ - pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); - pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); - pf_commit_rules(t[2], PF_RULESET_NAT, &nn); - pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); - pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + error = pf_commit_rules(t[0], PF_RULESET_SCRUB, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[1], PF_RULESET_FILTER, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[2], PF_RULESET_NAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[3], PF_RULESET_BINAT, &nn); + MPASS(error == 0); + error = pf_commit_rules(t[4], PF_RULESET_RDR, &nn); + MPASS(error == 0); if ((error = pf_clear_tables()) != 0) break; @@ -5553,6 +5584,7 @@ shutdown_pf(void) /* fingerprints and interfaces have their own cleanup code */ } while(0); +error: return (error); }