From nobody Thu Jun 26 13:11:44 2025 X-Original-To: dev-commits-src-main@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 4bSfGT6rCRz60Y0k; Thu, 26 Jun 2025 13:11:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSfGS6Lc1z3JCc; Thu, 26 Jun 2025 13:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750943504; 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=iG95itZ48kO8xAxHEP4xX5QBHe+Qp/aEgyhJbvYiG6Y=; b=dV80oIlaIRdNoLCZp6IGYvc+BMJKW3F3PrQRbaG/Na6xOn0Dlfrt9kVhoogOKm71ZgONkQ YEmgqEQ3maYC2btXdEP59jxuznsgA2Atz3uWnUeHp4/XilenPlPsE2e3V8JVWUyRzfcGnX pzJ05rLkJise00bJct4qJxN/eqATeL9HEIKSOEE6kWmZCXRFM+Ni9W+EkYklGPaM3Lcgrh LIV/mYJMtPUe+83n05OvuxtT8p4il66/beS5ODMpY28VsrNkta5M0PayhZJFluXvKOif5n 2OVFk4TINzQH+Oat4/BAZITsTXxxFm9dJKLbI7sycZik5D9TVwMCnGtJBleZRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750943504; 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=iG95itZ48kO8xAxHEP4xX5QBHe+Qp/aEgyhJbvYiG6Y=; b=inR572Uvqo1UoVGywL1IQO2qBEQvAPYF0ceciuagCD/5Lm+j8XI9CsKby6hfhw4JT+4Ju6 Nl7IeQyD4F+BVHCyaVy2bb5AK9zv1B9lJ09id1K9/6TSNJ6hGNyU5tQrRlAtVzbgqUPDFq j23arf2YTlaouX+bj0/jTbebk76pMYyjSQ5qFCzK6bPmU3U92yvagsRN2zmj1S3ojJoJrV 3UwX4iZU0soHmZdKGMbx7f7zhDt/FMOQWIVcY9FIefAX7yNdAXmfaiTSw9C2G6SKP74S3D VE4FGRhr+IIYgxPk+fHXB+wHiKtopHV4UzZ4Rz/J8OKzxXGeoGhgVEEF6EnE1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750943504; a=rsa-sha256; cv=none; b=qnSXUKbKWx1VY07owyFS8YKaxOYLTIY2Q0coILFkE0qMpbSWwVT4eSmpjA2IC0q8uYPxlH 2BE6vDJ4AUMqt80mcTYXUpjJGl54d291qcWG7n5vJHYspxxqb0kXFmcxp+VhXbrY26Igrk /RRYjcNgH0/JHoScyIJQrYLAG+xmzvEymdyK7TF/+5pEOIsgWn2+5q7nWfdmd5KXwe0nOi XImcylLoHWRdxja+ASz3OLZYUVNeSH3O4cPJUFi5kM5hgw9UJzHhtHJVdhxqy27XsGHPt0 fXD0UmuS/80EH+3LtQSl5yiAEUO1eB9MyKP8rdCyulekkhaEOvb1dZfqRpIlww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bSfGS5bP9z14Bs; Thu, 26 Jun 2025 13:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55QDBiXQ022573; Thu, 26 Jun 2025 13:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QDBiGo022570; Thu, 26 Jun 2025 13:11:44 GMT (envelope-from git) Date: Thu, 26 Jun 2025 13:11:44 GMT Message-Id: <202506261311.55QDBiGo022570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 22e8dc82ff0c - main - pf: Use pf_send_icmp() consistently in pf_route() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 22e8dc82ff0c244ed97f1a43ad35d71b11555d58 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=22e8dc82ff0c244ed97f1a43ad35d71b11555d58 commit 22e8dc82ff0c244ed97f1a43ad35d71b11555d58 Author: Kristof Provost AuthorDate: 2025-06-19 13:29:36 +0000 Commit: Kristof Provost CommitDate: 2025-06-26 13:11:01 +0000 pf: Use pf_send_icmp() consistently in pf_route() It sets the routing domain and other mbuf flags. In pf_route6() the bad packet counter and dup-to check were missing. OK visa@ Obtained from: OpenBSD, bluhm , 51a22f9bf3 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 521969001f92..cdf48fc4d60a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -327,7 +327,7 @@ int pf_change_icmp_af(struct mbuf *, int, sa_family_t); int pf_translate_icmp_af(int, void *); static void pf_send_icmp(struct mbuf *, u_int8_t, u_int8_t, - sa_family_t, struct pf_krule *, int); + int, sa_family_t, struct pf_krule *, int); static void pf_detach_state(struct pf_kstate *); static int pf_state_key_attach(struct pf_state_key *, struct pf_state_key *, struct pf_kstate *); @@ -4342,11 +4342,11 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, } else if (pd->proto != IPPROTO_ICMP && pd->af == AF_INET && r->return_icmp) pf_send_icmp(pd->m, r->return_icmp >> 8, - r->return_icmp & 255, pd->af, r, rtableid); + r->return_icmp & 255, 0, pd->af, r, rtableid); else if (pd->proto != IPPROTO_ICMPV6 && pd->af == AF_INET6 && r->return_icmp6) pf_send_icmp(pd->m, r->return_icmp6 >> 8, - r->return_icmp6 & 255, pd->af, r, rtableid); + r->return_icmp6 & 255, 0, pd->af, r, rtableid); } static int @@ -4403,8 +4403,8 @@ pf_send_challenge_ack(struct pf_pdesc *pd, struct pf_kstate *s, } static void -pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, - struct pf_krule *r, int rtableid) +pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, int mtu, + sa_family_t af, struct pf_krule *r, int rtableid) { struct pf_send_entry *pfse; struct mbuf *m0; @@ -4469,6 +4469,7 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, pfse->pfse_m = m0; pfse->icmpopts.type = type; pfse->icmpopts.code = code; + pfse->icmpopts.mtu = mtu; pf_send(pfse); } @@ -9083,14 +9084,11 @@ pf_route(struct pf_krule *r, struct ifnet *oifp, s); } - icmp_error(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, 0, - ifp->if_mtu); - SDT_PROBE1(pf, ip, route_to, drop, __LINE__); - goto done; - } else { - SDT_PROBE1(pf, ip, route_to, drop, __LINE__); - goto bad; + pf_send_icmp(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, + ifp->if_mtu, pd->af, r, pd->act.rtableid); } + SDT_PROBE1(pf, ip, route_to, drop, __LINE__); + goto bad; } error = ip_fragment(ip, &m0, ifp->if_mtu, ifp->if_hwassist); @@ -9370,12 +9368,12 @@ pf_route6(struct pf_krule *r, struct ifnet *oifp, sizeof(struct ip6_hdr), s); } - icmp6_error(m0, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu); - SDT_PROBE1(pf, ip6, route_to, drop, __LINE__); - } else { - SDT_PROBE1(pf, ip6, route_to, drop, __LINE__); - goto bad; + if (r->rt != PF_DUPTO) + pf_send_icmp(m0, ICMP6_PACKET_TOO_BIG, 0, + ifp->if_mtu, pd->af, r, pd->act.rtableid); } + SDT_PROBE1(pf, ip6, route_to, drop, __LINE__); + goto bad; } done: