From nobody Wed Oct 29 20:51:29 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 4cxfYF3zgfz6FHxy; Wed, 29 Oct 2025 20:51:29 +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 4cxfYF3HTCz46Tc; Wed, 29 Oct 2025 20:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771089; 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=+zl/9lwJSbdtHuqsifl+73HBu1FRPTEqQ0yBZ8sLGp8=; b=M4bJG9CyMtbVel9FSqwW08QysEch5VI4IGAJJt6fNWYj6OCsPoqcFg+XC4SywfmeMCn78m M5pIV9R9qkVkPGk3g0HqZIKHwnDW6EzhC7sct6jevpY3b3eH4f42fd9bPKB+ygpctl6LWu kwfYo6KaNQMfYP/qdBdljK0ufNnsLMLXUyCurXIyJ9FkKawxF8JXXVQm5Z3TBIdk8J1ORQ ZkR+1Y8emOUmy59mBYlw8C6UV1Sn5BNim6CDoKcp8FZ8YpCZJXnHX18ywvJ9WeQxodeqW+ ui3Kgwk/tJJSPXiyANIO5+na3uU8LRpUvZmOaPVvURmFujP7oG8NNkW5xCOUdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761771089; 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=+zl/9lwJSbdtHuqsifl+73HBu1FRPTEqQ0yBZ8sLGp8=; b=Df8tZSc3J0JlQgEz3F9bWO86OECj1GiREJG6qTTlHRsahQBhozifOyFwvSHK2n9Uwn/ViZ tbeOkMMAQfEeSg/q48FWdgY6rz8PfvCs9sEMdMtpP6YjgdrrSeW2glfXJXkj9DNZC2bJ0A GKlsB9rXZ2gJez6aqsAgVCYeRMBSzKRMJa2sTx+7UCPHAHeDmzIfOBViFO3EIMnp6+XSUD 0mAddZ4aJtp7tmrfpkSDMhqs0LW5RQKWi4Ynwct3ugUtn2t3GVbwxFYQGI64llueDPSmx+ xaih+r8vAkcQ5rdec2VAAZRZj2P/99jfVEuEftxwezMQ3fORYb6quD9Bk+7gCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761771089; a=rsa-sha256; cv=none; b=H+AVthbiVBS1pUcK0XLi6z97vQRkDqZRu+4NAmcv0eHnPBTqeEOhhtOxfCNN3I+UdAWxc+ RU+DsdOfMxZyqWncgY7ELOJ7Qm/W1qL45KEfHQvt4+dWBFJ78BdJbZ0EBj4nx2KvMBr/Fn SvkUXxyQwrgA132d+u8FI4Rn1ssSNhnVNqy1H+mzQ/0/GUqJVKu3hJC3SYcWMYWnyJuSW2 fkuh5ymYHNasP4n1mTolkzVfJwqvhS6nJw7cKRWmzKtRfFOxFILsV4ZZe0YbxzOpK/nTwk Qmf6nWA3iE4XZl+ugdRKzAlFTaJC/9uA0zkKtXmIWtCkSUcPVCipRjpCZLMLAw== 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 4cxfYF2sRHzsRN; Wed, 29 Oct 2025 20:51:29 +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 59TKpT9g033766; Wed, 29 Oct 2025 20:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TKpTga033763; Wed, 29 Oct 2025 20:51:29 GMT (envelope-from git) Date: Wed, 29 Oct 2025 20:51:29 GMT Message-Id: <202510292051.59TKpTga033763@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: f17856896d32 - main - pfctl: only set limit restore handler if limits are changed 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: f17856896d329204b446e6e918e87f949a70806b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f17856896d329204b446e6e918e87f949a70806b commit f17856896d329204b446e6e918e87f949a70806b Author: Kristof Provost AuthorDate: 2025-10-29 15:10:24 +0000 Commit: Kristof Provost CommitDate: 2025-10-29 20:51:11 +0000 pfctl: only set limit restore handler if limits are changed Arm restore atexit(3) handler if and only if the pf(4) limits are being changed to prevent bogus error messages on stderr. OK @bluhm Obtained from: OpenBSD, sashan , 67a69daaf0 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 3d2632c1cf74..02d6c9c84a32 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2618,6 +2618,8 @@ pfctl_apply_limit(struct pfctl *pf, const char *opt, unsigned int limit) int pfctl_load_limit(struct pfctl *pf, unsigned int index, unsigned int limit) { + static int restore_limit_handler_armed = 0; + if (pfctl_set_limit(pf->h, index, limit)) { if (errno == EBUSY) warnx("Current pool size exceeds requested %s limit %u", @@ -2626,6 +2628,9 @@ pfctl_load_limit(struct pfctl *pf, unsigned int index, unsigned int limit) warnx("Cannot set %s limit to %u", pf_limits[index].name, limit); return (1); + } else if (restore_limit_handler_armed == 0) { + atexit(pfctl_restore_limits); + restore_limit_handler_armed = 1; } return (0); } @@ -3474,7 +3479,6 @@ main(int argc, char *argv[]) if ((opts & PF_OPT_NOACTION) == 0) { pfctl_read_limits(pfh); - atexit(pfctl_restore_limits); } if (opts & PF_OPT_DISABLE)