From nobody Mon Aug 18 17:19:19 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 4c5KFg4knyz64CMN; Mon, 18 Aug 2025 17:19:19 +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 4c5KFg3vqPz3CXL; Mon, 18 Aug 2025 17:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755537559; 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=iyyJuiNtzuzTaZGF3dNgP/Yt5CxtNKuHYNg6oKMDSf0=; b=l9as0+Q2YKdaqyhJVpZ34cHjYnjkEY26Pg/X7c5ocvvr+I1819t5yxfWJQCXJygtI6UDJz vDsHg0IPILvHuDXzqO9jwAd8FdQIbdJaHyE764pjPxEMohvh/J1em09cSKin3gESVGmhI8 10g9HGS5EX4bogsC8Ycr5aFG6n6qwPOcXisHH9W2RBDhP3E/gfWokt6Bb/TXs4XRBGYbLD Nfz9U+TGmQKNUUforVkifaROoXzhXeTJhJHPOurlYTJSGjBf+1MYs0W2dt01G3ZIkGe3oM 8kPoLOkzElVT8sy5u8AMvcit8VgKCopkJf2rgqgwifl+aQofBj8oQrpGEM5rcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755537559; 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=iyyJuiNtzuzTaZGF3dNgP/Yt5CxtNKuHYNg6oKMDSf0=; b=xoigsCJMsBx4SQKcudbve/mCNB74PXUd/xr63Iv5KQFNJLREGhK7/wghk01kvaJvQPsjvl LDQXv/pLd527pXYLURl0lzlqFP/DtPh+DUzhlE0lnRgdKeqX/gtTXhjPY4pViLMYlYanEG M4/QRD984/+0ZmiwrO8T5ixi5EStZ9WbLWfD3DwBTlbLiTyW3WiX64JdTd7rqbvxmGCakw hqzarUs4ShBskF+T1pQORutha5vxJiHN720sHdYJES3bE3QUbICMnU1XS6+NU+0bBgaaPT fhRXpAn4W38p8Dxc0pfJMwiaqNONSumu8lmVHXTEc0zGE2for9K5/QCXoA6tDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755537559; a=rsa-sha256; cv=none; b=OP/Kr1SjNiAFYaAlyjhydlNpf67DV3jm+Vw94rhBlCExpUH6sHNokRu4i99HQqfBZKy2vu iGiRQmTDWJRmAfPA6APgQCq6or90fhYnloKKW38vTMTD8t/G72/JETYX3NGOsOrlbHacM3 V3Bta3Oqkn4JpSZktgFhhs462uSCblZfdKTEKn7YrXNDYj5qwiT1q9V4xzJpPVOV5hWdLt tfRayEFjjCSqok8oJDUUDAxQWUibrM8omhxycfsCB+ROx/y3+CP+VksS2R1rEbqh8MDmZU TPzNmTrjPV4I3oRqxj6l4pyRoAMT3kZ3hZCdKwM6cFREnmE88tBgy5wLTmOPIw== 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 4c5KFg30dmz15D3; Mon, 18 Aug 2025 17:19:19 +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 57IHJJCv071504; Mon, 18 Aug 2025 17:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IHJJ85071501; Mon, 18 Aug 2025 17:19:19 GMT (envelope-from git) Date: Mon, 18 Aug 2025 17:19:19 GMT Message-Id: <202508181719.57IHJJ85071501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: b9a2d84b1bf7 - main - icmp: clear offset and flags when reflecting a packet 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9a2d84b1bf7f9cf556e2f0b68023d5af8362797 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b9a2d84b1bf7f9cf556e2f0b68023d5af8362797 commit b9a2d84b1bf7f9cf556e2f0b68023d5af8362797 Author: Michael Tuexen AuthorDate: 2025-08-18 17:15:39 +0000 Commit: Michael Tuexen CommitDate: 2025-08-18 17:19:13 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D51991 --- 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 543b846fbba5..fc0848b2c944 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -391,7 +391,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); @@ -872,6 +871,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) {