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 4TZF2K5KMhz59qr7; Tue, 13 Feb 2024 21:34:01 +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 4TZF2K4ny5z4YdS; 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=1707860041; 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=I6GWdfcFij4TrVr8PbZ1ektqEIMIRRGcrG5ypO9lMEg=; b=jQYaxPdbKvtGZHFl69C/F+HoNl7H1vsKkxUdMKk9Fp0vRQM0BDGbyX0z4oOvw2Nglfl22N nSj0bjE/tjxd6Rl/Koo93eC60JxZSqfS0jlazE1pkcGCfXxMfc7YMsRgxyGisOwsHXrP5F zdR4bSx3ecZRDiE0Fy9zWItpkTsjTbZrxSecCsshLcOXjbbdQ1FAt1JqwsuQnbC3PUE9Dn btEKyfFrDCmPKZS4UEniVE9CSmVtQ3U84rrlq064Q4e7AZ3feJS7ZJA3V/n+jXOWYfy8Jh HqrbbMfF+aS8w+Q6gKV428LXchJd4PR3r38hX5rJ02k+iW63sx/LWN/vcI6iYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707860041; a=rsa-sha256; cv=none; b=XVHoj8+z+lOmRc6o/sRYMqoaMPaT47TxfdDGZ/73weGqAbE2NK4jD5jCjANIYJ7cUqytjV PHR6zRmBWQFDu7HL7aFED2EWOl1LVqtO1be7VmZI28EDSobmqWkeYDTca91HD6lVliJ1im nuoKzQ7YNIKNZ9WWQdlN/Y8U9xoLpgNWHhWVWh1q9kDkjP+EaYZAPsyBi0qPOVD0WjKFqh hkjBMhup0bKbIZ9r4MX0M2Pds0V3O6HUWEhczLBr6+1Ddt9PHFBHYySMgYHwtwnAADyttd vv8sdR/DQpICSAgZRDIwasJyhjTHS/FBvRRkdRdRV0DumM0BoOgNkAhdL25sEw== 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=1707860041; 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=I6GWdfcFij4TrVr8PbZ1ektqEIMIRRGcrG5ypO9lMEg=; b=lvYv4EXlpD3l0CQ0tb8d/DdVwL7nVnLfHVdGiTbEIoc0TO1R+br1aP8eNwUW8WgeTNI39D 9f+LlY8uzrfF/Sqat7zjbnKLX23BuTZmhcmte7pKvQsjq+ozTkz11fKzkPk52J6JgPa1pe LfVCjdYEz+WJ3fMYj78liyoZOu/yPjPG/LciImHznbGO6Fi7QIHoZx01T+ADDj710sHzS0 QTwzj0lG2+ZyyQXu0lN4WrXF2SesD6jJsSzy2dx+eiTyW2CM/+nOJb/6nMbH8lW+Jw2l7U wchIyROKX9He6xpQodv6fiKXI0/J9JPl3mn5BC3v1vVm9e+xvpN2QydF8guVDg== 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 4TZF2K3rPhzXMM; 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 41DLY1AY025939; 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 41DLY13a025936; Tue, 13 Feb 2024 21:34:01 GMT (envelope-from git) Date: Tue, 13 Feb 2024 21:34:01 GMT Message-Id: <202402132134.41DLY13a025936@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: d18b1958ade2 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: d18b1958ade203f16f24276661e553c076d5d7a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d18b1958ade203f16f24276661e553c076d5d7a9 commit d18b1958ade203f16f24276661e553c076d5d7a9 Author: Igor Ostapenko AuthorDate: 2024-01-30 21:04:57 +0000 Commit: Kristof Provost CommitDate: 2024-02-13 21:32:15 +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 a397b9e99261..1a383ae6fd09 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6914,13 +6914,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();