From nobody Mon Jan 26 17:24:54 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 4f0Flq1rvDz6PKfy for ; Mon, 26 Jan 2026 17:24:55 +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 4f0Flp4x2gz3Pq6 for ; Mon, 26 Jan 2026 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769448294; 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=XF1kQMsj+8k0rpr18d9OC3vhiTcqQMZ7NyKQF/tc2xU=; b=aRdQYsD7/MCgtKsE0jAnbBl3z0/UgiYXAhpvFPG27ywcEc+aMzspkXRnBm33fnrTmFoIK1 Ew83m5GH4BBlBd468MwEQGw+3SNjCcY9ZTO7CPkSnJEhHYWcyY65DRO5gHtwVueP/yy1PM I8U2gu3Y4D3Gplxd3OBiee8JZGOOegcrho1JrjSNhP5vlZJv9GABhucaC5sec1oBsEQeUD YwuCixnSrfcqTITuKsXkZAa5y3YaqlvFg3VC5z9CWIGPEUoVZmxhbGO2VnNNpLYlEWbLTq y+Ge3otr0tg6BlqR+OZRbD+agvNPF6snBl+4DDZ6+69NMs1hBQYE7/KBQmFJ1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769448294; 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=XF1kQMsj+8k0rpr18d9OC3vhiTcqQMZ7NyKQF/tc2xU=; b=oxCYZHJg+V9HYZwT5hLTfIGfZXn8WKRTmsE5wboUNeSRLxu0GkV8+ZBLIZ8iKNUIlhse03 u4PoUHyuli/yzm+t3p3y+qEuuK6X5tFI7KPZOCM6lKv+BnMxYuIVF/ePDzx2zTKhPSdGe/ C8fzNILPBqPfMlC1GIyzeSJdvDqfW7EfU0Xy/NnadtXzjq35NAtwPvDAfuMZ7IKY7/Zs+E 8wG8h0bXIl/5I+qRC/eY9toPBVug+LE3mpluo4Uhlup4nufjtreW9D7+1Zuf4aAUXq6k1o dLqThzmwmQT+APANPah0jpr1DUs8P+32cKWXOzV5ZlX28ZH1IWxqut3C9TkIRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769448294; a=rsa-sha256; cv=none; b=qGZqMA/gFH1K3B4E3Mrom/vVEhE49zWAGsQTo1prftoQhvmiXzMnyuxfO/XAaL5X3+lrYX 2z/Vv0gFdxwjqQg8cp5GM2eEZSagEpybi4uEC09/xEvOCTRR7HLZWYVKbZJl/fLPtUpIzT mi32W2nSs0iowKmYKZJDS0TcxZz5b5TZZ10fcnaf0nUA/ZANtrzMfRjtRzXV22JOGL8dFo hS2xVAIVqpMYfnP9u9OqRYGEQRvnALIOgTbChrHEHUuViKBowHhGQtL2bNITloREA9c56M sKsPVitF7Wu/ymC76VMXXQJZUtF4ugF+pkUncUjCvdX0gJZnnnePp2WtZaeF1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0Flp4SpRzVMn for ; Mon, 26 Jan 2026 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42d6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 17:24:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 39878d24a690 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 39878d24a690feb4da3fc223649c6a5fd166d09d Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 17:24:54 +0000 Message-Id: <6977a366.42d6e.1a73fa33@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=39878d24a690feb4da3fc223649c6a5fd166d09d commit 39878d24a690feb4da3fc223649c6a5fd166d09d Author: Mark Johnston AuthorDate: 2026-01-26 17:23:33 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 17:23:33 +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 --- 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 bec6911795bd..c01b32e5a8b5 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -11961,11 +11961,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 = @@ -11994,15 +11994,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?! */