From nobody Mon Mar 30 15:09:15 2026 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 4fkvmD2RJlz6WZpf for ; Mon, 30 Mar 2026 15:09:16 +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 4fkvmD0n3hz40VF for ; Mon, 30 Mar 2026 15:09:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774883356; 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=T62I2lTFaqynUbJzHnpVxfSb+H6J6NUXwFuUnU+zaU8=; b=m8Vlby7BcBFdnz/k6EG+GTJfco7CEECYUqK6iUESuOG0L0v1GUxAHpUR6Qfh50aCwDJ1q+ 89660D4xgyrK2qMvssm2vOlhunaX7ZI5kJPN8wPm8AAkIb2qb2JYLCss7lZV5dKoeJbf7l a8sG/AAV7Ry971GogGKLVke3/4DY+zQySS3nouvlAHKNeE7CfeXdSfUg8L0bNZq4G8e7zb anKm02RgdKcpNBG1InRrl4I5ygIv+n7YhJNlHI8RG3cx8kD++YwlO6DEgckh7aptLqoSu6 b+zubS6o7ZQ9qRYFcKgyyjfWNmOVRCOZF27EIV8D31gefBFtQpF5wELETHJcDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774883356; a=rsa-sha256; cv=none; b=pmoC7rqwr2wAuNVmbHLzwXfXBhSne+EX2EAp/3vmldPrq+5hdmQxeCecMXxy/9i4mHOvcp yOoIZMUJZf/PQ4RgRlrO0mjwmBZTT1lHWMDfQpb2dLyqwsjdJGq+zDqxz/3ZO7Q/7M5QG/ hYUti0J6UaGk3Xiur2yNdh/QuEiR04FuhTa2wjRSXraiOi0DmNbyGzln2c0vJgptln63hB qxs9gfRrl5/BmL/Avk+4MF8hwocK3gpyzGKWNiAaW5b+u9Z+VI3RnPHSvyZzPgP08fdQij NQTudIi7Qf9yJ7mJkQWXYutNLUYyDQCZIeOxOQ47caK8WRCIHKOl2EaKoK+Y7w== 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=1774883356; 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=T62I2lTFaqynUbJzHnpVxfSb+H6J6NUXwFuUnU+zaU8=; b=cmjZhn8S22f4CKJRtlH0s5wBoROHEusl6D80LF9Ew9NcPcP1oBZdDCLp/iZqpE3rQ1nWwn jcZoXLXQK2AomPmrqbUslppF2RTlna6CZf7gAR7NSHSed5zcSHnWSCKb7hvRLnLl0DBA03 iRojqj0qx0J2Nf3vtqjpUDBsrXhc9AmJ1SViQPk2A3OdhtkqKsFcO+s1LlptF5OAU0FmdB VWHH/pxBx4QMbsPRRpeMJbYcE7kygkr8eU4Up8wj6gNcDtNRg2yF6neXbnoPtTuMsKD+IH 9UR6NUWWJGRX83Ty8+F0x28CZUoidVT1e4Gjc0bm5uQq+NcoVIWxi9TCpoh1CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkvmC6gjhzntN 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 33332 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: 5b8ab97b3e4a - stable/15 - pfctl: parser must not ignore error from pfctl_optimize_ruleset() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 5b8ab97b3e4abd3df9cee11d61115479fe2fc4de Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 15:09:15 +0000 Message-Id: <69ca921b.33332.18debfc@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b8ab97b3e4abd3df9cee11d61115479fe2fc4de commit 5b8ab97b3e4abd3df9cee11d61115479fe2fc4de Author: Kristof Provost AuthorDate: 2026-03-22 02:50:47 +0000 Commit: Kristof Provost CommitDate: 2026-03-30 15:07:22 +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 7865467f2ea8..1b0a342337e7 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2095,8 +2095,9 @@ pfctl_load_ruleset(struct pfctl *pf, char *path, struct pfctl_ruleset *rs, printf("\n"); } - 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);