From nobody Mon Mar 30 15:09:15 2026 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 4fkvmC5N81z6WZkh for ; Mon, 30 Mar 2026 15:09:15 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkvmC4SrCz40fS for ; Mon, 30 Mar 2026 15:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774883355; 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=HWGLRZgC4y6aQ00A4NT53QFDvLcVk0N+elL5kxEZr8U=; b=KOmWPQf3xWcM2zbljnHRgi9+QRJBPHmonrWiwWyS55nx7LKAaIlbExM6wxvCzF8jn40lgY 7g3WKuiG3gu8V5CvK0JYGY6crRv2dnOmOrDsFasY9zur0W+YOY5eUsSreSHSCwFaNbV3CM ibrXbY9uzYwmMwCQfO0cVFPlzuOIn5V2TZD9WPUPfLXDYSkWEEfebfrO+mP/mFPNOxwTq+ tglTHhp6kKCIxE5VAfirt44T9AZUCIB0mgIjs7fjRlRtEwBl1gi+39VPZFX4TYdFr3wwje Jryv1eH7v1trOtMIgluztoGT3IOc8p/alqq8H3GRmi/LkBmTUKvEIqyz3VOAjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774883355; a=rsa-sha256; cv=none; b=FQU9BydS9EUTbP64EDxBJXMjOozswEw2g3A9T+ty1x7bL5W6nW6GrcTj/fU+MNq8ZeLxFS 7Fqd36WDa8B+OmoBTszzo4XkelTTkxnlYpkBv9xByDS0x6L70CwPRivqJQUSCRdpI56vXL +Azv/2PIP77wLiBuhNA81vElLyHwGMbJXV+auwv+V3v8uakFm9sYdTwk17ukalgA03g0uO OlQaZixeweNXDBtrPQaJhYaogA+cQyEpsy0OfgVj/BUcXsNPj126l625KB2DjbyMfruERV 2rSIeatg6HyLIua+5bCYBPxUUPBxr+MuVFl0yCwkSabUwlfjaJVxr86yH8vGmg== 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=1774883355; 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=HWGLRZgC4y6aQ00A4NT53QFDvLcVk0N+elL5kxEZr8U=; b=bfdp7Y/minS55iTb+6foYoYViiZwIyaeZl03Bv4pbzJuKkfqnhh3sHrm56f6JPpBIedu+Y MmfL8enZ49F/WQL894pHIY//ZcYJphf4lhAbdC/4NRyzDlyXb2dHAW03RwHD+buHKf7TUs OY/mIJAsV41enIAShAYSzffIeW0+b6aqps6lFe1FEqgCW1wcTrJWZB2qract6REzsvpp/t 0+kjtb0KCqlRX0/MkD+Xk4TmiMZ9ty61/47ijZmnYVX7ZXE8APwNZ+Bvp3jEt36AsLPGdU cqi0t21VJreLgyq/j42okf9kAgiNiZIDE5wCgKiEHYI6maL3MXHqUtw4HKyvIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkvmC3wLHznl8 for ; Mon, 30 Mar 2026 15:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e89 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 15:09:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: c5e1dde24dac - stable/14 - pfctl: parser must not ignore error from pfctl_optimize_ruleset() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: c5e1dde24dacdeb9d47684d981e17178fd7e8acf Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 15:09:15 +0000 Message-Id: <69ca921b.33e89.158535ea@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c5e1dde24dacdeb9d47684d981e17178fd7e8acf commit c5e1dde24dacdeb9d47684d981e17178fd7e8acf Author: Kristof Provost AuthorDate: 2026-03-22 02:50:47 +0000 Commit: Kristof Provost CommitDate: 2026-03-30 14:32:00 +0000 pfctl: parser must not ignore error from pfctl_optimize_ruleset() Ignoring the error may cause pfctl(8) to load inconsistent ruleset preventing pf(4) to enforce desired policy. Issue reported and fix suggested by berts _from_ fastmail _dot_ com 'Looks good.' @deraadt MFC after: 1 week Obtained from: OpenBSD, sashan , 9fd28a8cca Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 343ace42f82a629374af4dc3a72da5f46f2c3feb) --- sbin/pfctl/pfctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 518b32085565..50ed978d1a74 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1959,8 +1959,9 @@ pfctl_load_ruleset(struct pfctl *pf, char *path, struct pfctl_ruleset *rs, } - if (pf->optimize && rs_num == PF_RULESET_FILTER) - pfctl_optimize_ruleset(pf, rs); + if (pf->optimize && rs_num == PF_RULESET_FILTER && + (error = pfctl_optimize_ruleset(pf, rs)) != 0) + goto error; while ((r = TAILQ_FIRST(rs->rules[rs_num].active.ptr)) != NULL) { TAILQ_REMOVE(rs->rules[rs_num].active.ptr, r, entries);