From nobody Fri Dec 26 10:49:00 2025 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 4dd2RJ5x6Hz6LNnt for ; Fri, 26 Dec 2025 10:49:00 +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 4dd2RJ3DZfz3W58 for ; Fri, 26 Dec 2025 10:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746140; 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=+4YvAWrVHMspcvzh4dg9n5kARcTi7uFEusYml1bWFXo=; b=Q/gUv0MbsLRjigD522jiwio4LtVPJGj8ysRlsNsO49xagsvK9c7/XttaXvKDomr4HeTrKg 71yAz5NwP5gHZj8C/Ov6hmY8rPlbaU3DvdyxOSYEOOEGJgoX8oxGM0IECk1lTTWTs0jGMk wbd/RTC49OvhpWYNT8RmcKL//XlVjSM6nlgnQE2NfpxbI4KZmaH3BlMAjkdtIlc8vTRyui gUMqZbEcAK0sOGq5TSZxKtb8OvIGtfhh7Z+tLLLlLyI9uYQY7BWKK86yYug0e1x1CyWUTo ns5AmiVTi0fGH8YN7TJge/mbs91rjlBRujiZnsxYzsWrAVC4lHbrKXO7E+idQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766746140; 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=+4YvAWrVHMspcvzh4dg9n5kARcTi7uFEusYml1bWFXo=; b=yMw8WTPe91exboMbBieS5NTGbFcEtcyIcjJnhPrqbM6xfZux2Y0vACDQu9vACXmO/1IjJj A0gOprvatGi/lkeP4LIoXwMIe+wmViJspBMlBc1yfQ7imluCzTfrI6PEaqNtnhfv0DKsGj 3YPcFInZimoR+0dh7Ny16cYxs9RfylDFI0I4TkbhTGKFE+wFnh9rFnPjtwDH6FA661ZyOu Pn3H1fcCuzHsIFk8Y5/cw0xfSHNlnsfUcUXLrrvxdpL985Du3FjgfCvHMhefVuNWSfq1Cv JUJu6j6DpNzgqOBo+jqB4kfEa8HvPQxOWMGfxySN7u5mn13Pk5zbwl0FmN8RYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766746140; a=rsa-sha256; cv=none; b=KsnCAerhtawQddTA9x15XZov56EqnYxHxzYlsc7O21hUoG91az/AkoUoUuT+IWH+6mL98K dFsevdVOeTtBj9jwKSaccE15qJy2ZSCTN93B0mVkkEfTRNl4t9X1xGvq1mkujSbO9D2D5X Z0kT4LBQshJqrnve8YXkAG6GqUJEpOIhKGQuW1e4GUpGkpPfb+2rNj0pUehAReIwyTjZiQ Bwrl6u9nSvloV7OXC1dhy0BDqC6fqZIxBQpG9nf6EUkauiPhxYfXNkeboQ09j25KCPON96 kJPSWxpp74SP070bBUNbFDBzECmEPXUo/sgWBRhQBR8eprgtsn3x87bYM7Zdqg== 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 4dd2RJ2R93z17wQ for ; Fri, 26 Dec 2025 10:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f1c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 10:49:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2e7699355f08 - main - pf: don't reject route-to'd too-large packets 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/main X-Git-Reftype: branch X-Git-Commit: 2e7699355f08258365fb5f65d11ac297e20f78de Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 10:49:00 +0000 Message-Id: <694e681c.f1c3.69a3facd@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e7699355f08258365fb5f65d11ac297e20f78de commit 2e7699355f08258365fb5f65d11ac297e20f78de Author: Kristof Provost AuthorDate: 2025-12-26 09:58:59 +0000 Commit: Kristof Provost CommitDate: 2025-12-26 09:58:59 +0000 pf: don't reject route-to'd too-large packets If we're sending a packet via pf_route()/pf_route6() we check for packet size and potentially generate ICMP(6) packet too big messages. If we do, don't consider this a rejected packet. That is, return PF_PASS and set the mbuf to NULL rather than returning PF_DROP. This matters for locally generated packets, because with PF_DROP we can end up returning EACCES to userspace, causing the connection to terminate. Instead, with PF_PASS and a NULL mbuf this is translated to PFIL_CONSUMED, which does not return an error to userspace. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 755b87bcfeb7..8219aacd20de 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9371,7 +9371,8 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, ifp->if_mtu, pd->af, r, pd->act.rtableid); } SDT_PROBE1(pf, ip, route_to, drop, __LINE__); - action = PF_DROP; + /* Return pass, so we return PFIL_CONSUMED to the stack. */ + action = PF_PASS; goto bad; } @@ -9693,7 +9694,8 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu, pd->af, r, pd->act.rtableid); } - action = PF_DROP; + /* Return pass, so we return PFIL_CONSUMED to the stack. */ + action = PF_PASS; SDT_PROBE1(pf, ip6, route_to, drop, __LINE__); goto bad; }