From nobody Mon Feb 9 18:04:27 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 4f8syz3zYpz6RnR6 for ; Mon, 09 Feb 2026 18:04:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8syz110Yz3tlF for ; Mon, 09 Feb 2026 18:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660267; 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=XP5a/2RDS5ioHLKwChHWIGD7CAahlmSUumD/nvN+/QU=; b=aWvLmmOfWlx/DQuDh7RwTh5yHQIGpBWR/Q+KtB4oj9SRhygbe+OLt1Yo0N//2hEad3tRQu 8RPVjWB5sL04j2gROqcX3tp9VDWSCFdZAP0wgkTBaXSVf7oaq3sxKqQE71VW9gda7AvR9J +gZJTsusWOfCQnBhXbLmVFVkTMtoC1yKhoN5s/Bk9Sfk5jXsxgK8Y7+iJNBpYjpAZUGU94 90pYbTJuiYyIz2tN2GHIal377fEy3JjihSyOvdWDEkcOleJCuMMqvwRd4n8Uub8ijRl3eY uqm45yGnrUHVQN0MaaMgOccrwlzYtHMn2khu257sI93IevD8qcAnIoKWpPCKRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770660267; a=rsa-sha256; cv=none; b=s5zrkJf7mYgCQGzb7fGPtM+fVjtZse1zpjBHkZxW0wHTu+Q/Db4/HGMFDmg6kyXFY3QSdH hMVkYhU2x6ugXcRmXtoJj3I9NrfVhNRNc/RGkYsOetC9QuoV4LBZHtVuU3/3jpzESOyeUh qqZ4FAGintFNdMi/UrkAu87yMyJwdgmWiIwGzTmbpoXSc3XOiZ4bwWYPFTynEFUGLzQv3S HvtHp/deVXP/fcOR+VUEih9xPokNaNeaR0FWHDgq9graB0/e1vsQ+dQaBJHUmL1cULGxBK lBbCcJNF3q/cyeSKx/GoknQYnA8eDP4HHmsC6wB5oED032JKcELqN8AxbHwQqg== 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=1770660267; 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=XP5a/2RDS5ioHLKwChHWIGD7CAahlmSUumD/nvN+/QU=; b=bECmXrdi+A+wAQoYkMf46EaywPp0JhPUh7tulCyF8Kxrbwl4YnNSRl/BqsvJ2wou0jgpT3 RFc/J5r41jdYt9o85M0XbBQQSkpVB4McQ/xSwa43gYHQgHJ9Vs0bXxh8pn+ETfWHOX4SzX urKCjvbfPFikEsEmyEj5J+yMpa6xmutg3Y/ECfMf14MTncuOlpYlxuPrQs0RNVdQHb4u/m q0bWp983GlymTYa6je8GuN2QSbHT9+yRv9Y2vZwY7X7uyQiKGVnaxqH6G5KFQE2yKUhMXx P19Nl/xpvseX4JvBZF1aV0W12C8iA8cC0CoGF4cKJu48GTTX8lkQwg7V7fMeLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8syz0TCJzkcc for ; Mon, 09 Feb 2026 18:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27da6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:04:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4775399b4e87 - stable/15 - pf: Rationalize the ip_divert_ptr test 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4775399b4e87a01f6448a68e8ff13fba8e69876b Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:04:27 +0000 Message-Id: <698a21ab.27da6.1df8c3ac@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4775399b4e87a01f6448a68e8ff13fba8e69876b commit 4775399b4e87a01f6448a68e8ff13fba8e69876b Author: Mark Johnston AuthorDate: 2026-01-26 17:23:33 +0000 Commit: Mark Johnston CommitDate: 2026-02-09 18:03:43 +0000 pf: Rationalize the ip_divert_ptr test If a rule has a divert port set, then we can reasonably predict that ipdivert.ko is loaded, and in particular that ip_divert_ptr is set. Moreover, in this case, if ipdivert.ko is not loaded we should just drop the packet instead of ignoring the divert rule. Reviewed by: igoro, kp, glebius MFC after: 2 weeks Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54845 (cherry picked from commit 39878d24a690feb4da3fc223649c6a5fd166d09d) --- sys/netpfil/pf/pf.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2cd3ee535b85..dee02d296f1f 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11232,11 +11232,11 @@ done: pf_is_loopback(af, pd.dst)) pd.m->m_flags |= M_SKIP_FIREWALL; - if (af == AF_INET && __predict_false(ip_divert_ptr != NULL) && - action == PF_PASS && r->divert.port && !PACKET_LOOPED(&pd)) { + if (af == AF_INET && action == PF_PASS && r->divert.port && + !PACKET_LOOPED(&pd)) { mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); - if (mtag != NULL) { + if (__predict_true(mtag != NULL && ip_divert_ptr != NULL)) { ((struct pf_divert_mtag *)(mtag+1))->port = ntohs(r->divert.port); ((struct pf_divert_mtag *)(mtag+1))->idir = @@ -11265,15 +11265,20 @@ done: } ip_divert_ptr(*m0, dir == PF_IN); *m0 = NULL; - return (action); - } else { + } else if (mtag == NULL) { /* XXX: ipfw has the same behaviour! */ action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); pd.act.log = PF_LOG_FORCE; DPFPRINTF(PF_DEBUG_MISC, "pf: failed to allocate divert tag"); + } else { + action = PF_DROP; + REASON_SET(&reason, PFRES_MATCH); + pd.act.log = PF_LOG_FORCE; + DPFPRINTF(PF_DEBUG_MISC, + "pf: divert(4) is not loaded"); } } /* XXX: Anybody working on it?! */