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 4fkvmK4Rr1z6WZtn for ; Mon, 30 Mar 2026 15:09:21 +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 4fkvmJ6Dx0z40rK for ; Mon, 30 Mar 2026 15:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774883360; 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=BA1Q9SOQEzwbsDMb01v66iFnc+u5rCNiOJ4Q0zRv7yuwn7+ndCBDwk+YpCAjfM0lZ9mpjj 5UOKhBwTg8AikyfZ8gecYKw8EqUlJVAOafA//K3UDsE/wgjvMNzirn31ti7NDYVeLCQVDV cU1H391d0UTPAt6/R+6oThKdzzxU9WUWxxpIQqq/GC3AO5IW8oHem4hCks4iy27CNqimxj QJU2d5i5Ff9Lm6uOpwG8H/0MRFb25GNRzV+MNIPZE9G2RwUhXQwqUe6qYtzM8McXpZrtLt //dqSxMmd1FNdPfEcMMPYZcuMDNaQM93idfoUNMusksEgUs1tbG1TatBrXmf0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774883360; a=rsa-sha256; cv=none; b=E+9gNpOefwdMDA1pPI4y2w066vpQKLKpiAEExNLAyxdjEW+3g0APZ+NLzcPHYtd3MvG4Ra nnzRlLkFQN7WKxvBGQdnig5L5juEzIJINGLQpcaBCKx6R4tXKKZFilY6jZMysHhmnE24t2 3R39RtEDXhmj8QxUM4wZKC4mAOw68xmgsypbF9skBXnHAjjnV6n/z1tjdF8EEXPMhigspC FOTGtwzUU2Nkp4kuzIRNtOQdBu3GMj5wXACSCAXtBN+nI6RcOWZZGwTHfG0rI4hDVk0E4u nbm1R4JVr3F99ZxAEPJuYNzB1gwXgFu2L0uiYJbS0mIjF2Zb6zyCGbdwgya2yA== 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=1774883360; 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=jOMX1IkLbG/p+1fRe7BUyn13aqYzzt+0qmIEpP+c8zQ/ar7mxky1ogu+2BUi/YbthWaqrE p20UR5rUY1P9YRxos/q6EYmaIOx3qMi2x91OVmHe8+WzsgGINEUT3cLknonFDUYxMozXjz z+iPtjyOBKCNC/+x63F5fBiLTZDFd504Y2kzLa1QW0BVzuuiRa4dKzHEqRxLNd4FFwHadL 5nKXi6h6yjDuVLWasS70zb5jrYGLlJvBOezsh3cTeUke9vp3M5vwly+ZQrnn+hgtrWMJDc ukXNmQmC2IHmkVtjlfi4uV+EV81jUdKm5frMZ/DQGq/2S/EuFsa9a95rcZsf3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkvmJ5nrZznVc for ; Mon, 30 Mar 2026 15:09:20 +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: 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/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);