From nobody Tue Feb 13 21:34:01 2024 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 4TZF2L1fJrz59qQj; Tue, 13 Feb 2024 21:34:02 +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 4TZF2K71YRz4Yv0; Tue, 13 Feb 2024 21:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707860042; 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=1FwnwKanWX0R1yxT7B1K/8icIRBlpbX7dBVIuxJbeps=; b=TyyWL3H2rihDDXFKVbAuk47W04Tl8QUnFJeuW69T4BHRcdBSpXPU7W/IdXnYqznJJjXA5d KaM6v/PCDpPztev2DBIpWty8vkLLcaJK1u7qJ1jIo2JKGlGwzj5jwyPO+54/iG/reHQZKa z3vZlTTTDO9X1qB5jIzA2rgQKHZwN70aM7qHrT0QwjzwJ7DmeML0rsCmVrOZRj4bLm3LVW KVgAGvlEpuwNAVzVKh30TqmauuuA3ZZ6nDkMOrMLHehbaT6rXCwV2Hlyp7FPmbovwddP0E BiH4ZYy2RXFjzG7bFzDggAcyQFCIsJm/992YJBHeKdZAcpZrnZnNQXH1wH87Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707860042; a=rsa-sha256; cv=none; b=IVE8dToVY+OSCxDjstAaDl+Fz3k5rgG4NxdjZNSgcy09MEtapgItGj7U3k5uMyGJ2JI0pC axSxAH1lBkWUpLts1WzH13Y4bCvv9gSlOOCMnmYDYC4+h7rxYNhadCy7iZzdDLPxQofKlf ERY6E/32jt/FBrPetpUTQVyYvsR7XZuIAO0UalIbdgqoOFKi/0aBkkQq7S/WK9+UU5Wa5E wFqDyPqAbjU8I01SAJh/ttOOp4mWb8kTinzo5C3rs7/MBpNTvoeSC/GVXzHg0pYQmvS519 H/Ly7QmqfMrlZqU2bthE8q1yJSzbyU6W/Q/a+DABTeKPTXGuLuWHRbYTzNrGWA== 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=1707860042; 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=1FwnwKanWX0R1yxT7B1K/8icIRBlpbX7dBVIuxJbeps=; b=guDF8f3BHyMBHor9/DwLA8AursJ3GOxFgfZrURQtz8iPDKaFk3XUZC5StR46qTXpu/myxb eIkGw5kwvY/YbdroCSA9FhA5DMeCCJFIgp5uLzIInt4mnEk8cJ3gwnpZZLakXBvvFtkowl HuhDTHA+ummuueHnsydFvWgkxxCwByE2n3jX7idne4fbRA9Qkf26llPBVgIlEYSnXC4em1 O6vWWS1cVbFCg1RvovwXjJAUn71WSYBgrAik3naIvqI3p6JmqRsLQ4DAVwH1XrUEz0EK6+ 9Kjt6v90TYtYFuwziqwnvIrmmuCjOILTeao0+511iezFBeYKUWjqtyKfuMUvJg== 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 4TZF2K6616zX9W; Tue, 13 Feb 2024 21:34:01 +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 41DLY1xx026042; Tue, 13 Feb 2024 21:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DLY1cE026039; Tue, 13 Feb 2024 21:34:01 GMT (envelope-from git) Date: Tue, 13 Feb 2024 21:34:01 GMT Message-Id: <202402132134.41DLY1cE026039@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: 17167f757e0a - stable/13 - pf: uncomment counter asserts after mem leak fix 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/13 X-Git-Reftype: branch X-Git-Commit: 17167f757e0a14ac487c608459aaba6d10f43f12 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=17167f757e0a14ac487c608459aaba6d10f43f12 commit 17167f757e0a14ac487c608459aaba6d10f43f12 Author: Igor Ostapenko AuthorDate: 2024-01-30 21:04:57 +0000 Commit: Kristof Provost CommitDate: 2024-02-13 21:31:04 +0000 pf: uncomment counter asserts after mem leak fix Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D43657 (cherry picked from commit 9d784da3a7af9b9b04536c2e97459a7d9f92e364) --- sys/netpfil/pf/pf_ioctl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 81b766cb7f6a..98b5ce318596 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5863,13 +5863,8 @@ pf_unload_vnet(void) V_pf_allrulecount--; LIST_REMOVE(V_pf_rulemarker, allrulelist); - /* - * There are known pf rule leaks when running the test suite. - */ -#ifdef notyet MPASS(LIST_EMPTY(&V_pf_allrulelist)); MPASS(V_pf_allrulecount == 0); -#endif PF_RULES_WUNLOCK();