From nobody Fri Sep 5 19:05:48 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 4cJQmD6DvZz66G21; Fri, 05 Sep 2025 19:05:48 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQmD5cy7z3Q4v; Fri, 05 Sep 2025 19:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099148; 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=TEdlgPyWaMjk5WDjgeFbN1tMXNSF5yRVlcVdvZ4ebLQ=; b=cvoW1P7Twug7pUEF3cSTeHu8EL0PSqIF6Po1TR2zcfoShoof5iZEhnhfJH3W3tevXBdHcI yoB3jvOWkYbUjQyfYgY9oaVguQvI6HfAcOt39rv6OMUkwdr+EJIQ0zRNJYuqBpqpMM/8rI Jo4NYStqxQByIks5RNXRQO/HWVDoARdWFJYX0WQcFavAnugCv7ElW2AdYyCLKsunvLX+7Q NmaVRPF590MqLS3fG9eq/pvWJsEQQDieEtXEmql7YwoXGVe4RfU8igjuL/omMh1jVPvGGu rkEcy8Kax+YyPD2D3/01XnJu9AiNM10bo/FJCmyQJ3bNgM4XXFwe3hjF8Ng/ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757099148; 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=TEdlgPyWaMjk5WDjgeFbN1tMXNSF5yRVlcVdvZ4ebLQ=; b=wcKSRCHta1xm6RpBqsG5e7CejsVCV0cfBZXQCMPH9E/4hMOq+p8SyVvDjRle7EnFwfk8y2 8F8rx/lzKENwh3kcmcqMP4Cifi9koU5dz87at40xbxdIV1+X/EV6xqtaSKLdxwDvbzrlcQ UiG0dJGAKRLVTpDMEPPjaezPA6fn/+ai4ULaLJ0TR6JtzRl7FhLv0nYkaI6w63V5TG+QMf nBp2TNdildszK1QHK2uTVq/woxYAtkajtjKOb0epMeYI447jaBl/BxkFNrh/M01NvyCjw+ l9QQxlIwQ7ntpQWrZT+fdMKN/APIbRqaDAFxtCEWft09+x1pe0SxWe3VjPuzZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757099148; a=rsa-sha256; cv=none; b=j2oPrYC0KfrrS9r171Uj0mOHGLG87L4dIi05rRuswa/sfZtX14UNjTRkWebdfj42MmtcQt 30STpj4EQI7LDpa667g+NW0FvFKnMhS3A70njd8UpHn21utWUtlj+3iEZZ/FAbOK8hR5Ny bQcPhENgeceAd/5R+hpwS8nhr47nNQBZCNrBJnqHYDk6nrc13KIQEH77U047jkEhZJsP4X 7DLWYoKlWiRCSRoDTV8/vCW/27YbFvRVxHv7NvpmM62DMcpxTvKUFKrPpp52Cmlh684a12 okszkqj2DoWMzH5BLgBCyrmXmQDWnHIY1NhxRzIZ5UYhht+pRgh+Dc9N8yp4jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cJQmD55wSz11gB; Fri, 05 Sep 2025 19:05:48 +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 585J5mDl037624; Fri, 5 Sep 2025 19:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585J5mCi037621; Fri, 5 Sep 2025 19:05:48 GMT (envelope-from git) Date: Fri, 5 Sep 2025 19:05:48 GMT Message-Id: <202509051905.585J5mCi037621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 9feb2ac05b77 - stable/14 - icmp: clear offset and flags when reflecting a packet 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9feb2ac05b77a10f992107f2fbc1ab61c058f200 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9feb2ac05b77a10f992107f2fbc1ab61c058f200 commit 9feb2ac05b77a10f992107f2fbc1ab61c058f200 Author: Michael Tuexen AuthorDate: 2025-08-18 17:15:39 +0000 Commit: Michael Tuexen CommitDate: 2025-09-05 19:05:15 +0000 icmp: clear offset and flags when reflecting a packet When reflecting a packet, use an offset of 0 and clear all three bits, in particular the DF bit. PR: 288558 Reviewed by: markj, zlei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51991 (cherry picked from commit b9a2d84b1bf7f9cf556e2f0b68023d5af8362797) --- sys/netinet/ip_icmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index fffe7e280a8e..29ce294fefd2 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -393,7 +393,6 @@ stdreply: icmpelen = max(8, min(V_icmp_quotelen, ntohs(oip->ip_len) - nip->ip_hl = 5; nip->ip_p = IPPROTO_ICMP; nip->ip_tos = 0; - nip->ip_off = 0; if (V_error_keeptags) m_tag_copy_chain(m, n, M_NOWAIT); @@ -879,6 +878,8 @@ match: mac_netinet_icmp_replyinplace(m); #endif ip->ip_src = t; + /* ip->ip_tos will be reflected. */ + ip->ip_off = htons(0); ip->ip_ttl = V_ip_defttl; if (optlen > 0) {