From nobody Wed Aug 19 21:04:00 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 4hQJw12JH2z6pfbq for ; Wed, 19 Aug 2026 21:04:01 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hQJw0604bz3lZP for ; Wed, 19 Aug 2026 21:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787173440; 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=9C7u2LInTuuZC51S8E6+ChlVSFmjU5GHAaHQ6TK9qhY=; b=XJmRdBpz8GEx+TAmdNa4PsBaMwe8nz6ZaA36fomGmTqM9/aXeeKtyquTO3qVtVNI0LIGfr kSqqrAjBHJsGJ6H5bcfqxB9uJADiSSxh9XR17MfZGr0wVLHkEiTUvqY7IA74gq9QIrwwzp 8fZ8cMlPOBVaKSLvNAKFVnRvySJ5AulLRJk/0lapGbxDLM9tT1hmezVlOzaA7jkAlvgqf5 dTJSAy8eAz75Tm32L9HxXBbTnVxtZ83X7T0GMU08DaZZQ+vHwM4cg2wpEnsK4BU0mstgGT nNryY0YFKm5I0t6gPhbVEHG3KVaECqG1IADZMzQVBoCbVa3x+/K1VqHLpH59Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787173440; a=rsa-sha256; cv=none; b=GgyGpO/Bg84i05MgWq02htwI9f4THmCFC34rF39q+RPEaX+v4cuYkQj9YyybPTdtAX3k7a OquPoNhCYMB+z0mF4V/68Cjmjo0M4dsQxa12E4cEU80roGW5CddsstAKaXSU5RiqnFu21O AN6zTo5PCiaFFuOj21vZdNXSIEeE+o5UH5FlHXcLvP+OLLar3zIYd3lw0iTIu2MsjOXqLA S97qIg09k/85s8CtyXPbNj2eA/fnpJS48fMPT3h+nF7/mB2ZZtpNCX949G7S/H3gMekbq0 aRaIwo02PZd8MvgZ6a5I8qeS6SzH7R3Z8pwfeiUrw/RDp4LChZhwlIF78OisQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787173440; 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=9C7u2LInTuuZC51S8E6+ChlVSFmjU5GHAaHQ6TK9qhY=; b=bQl7waT5KRoq9zR+rP8svLjOXR8Jpxc7oD52QG2vMRWKy2D8R8VpPJ0R2HyfetPJ/WoLah GQDxaZoxw+CqfB4I7oZOCrKF70dg3eEw3XWyGOtcYNu2oXTOEuz2TU2quEWwZ/1PmDIIbH cQeZrDtPoyc0ItsNKdWaYBoz/aK26bFh96JCO2M058uqSXOmptB+QCo0XhQGlizSauEfgs S5ZH5kjbW7hav1Z3YlmjEtUcUY/dAgPXyKHqYsjPzLpVanQQz3rTRrywvjf30wYdX9sLtP oR/ucXEO57ftWyyt9YDw4T9KZplaLAOvCQz5NwOrEhmXfNvQHDQoF6FhSN6kYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQJw040tbznR6 for ; Wed, 19 Aug 2026 21:04:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30fb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Aug 2026 21:04:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1fe3a2897b4a - stable/14 - rawip: Fix handling of checksums in rip6_input() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fe3a2897b4ad7a9b9128efd6ec0c24b371bf5bd Auto-Submitted: auto-generated Date: Wed, 19 Aug 2026 21:04:00 +0000 Message-Id: <6a861a40.30fb8.2082cdb8@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1fe3a2897b4ad7a9b9128efd6ec0c24b371bf5bd commit 1fe3a2897b4ad7a9b9128efd6ec0c24b371bf5bd Author: Mark Johnston AuthorDate: 2026-08-04 13:35:35 +0000 Commit: Mark Johnston CommitDate: 2026-08-19 18:08:59 +0000 rawip: Fix handling of checksums in rip6_input() A v6 raw socket may ask the kernel to validate the checksum of an inbound packet. If it does, and the validation fails, we discard the packet, but this isn't really right: other raw sockets may wish to receive a copy of the packet anyway. Rework checksum handling to address this problem, and use a flag to avoid computing the checksum more than once for a given packet. Fixes: de2d47842e880281 ("SMR protection for inpcbs") Reviewed by: pouria, glebius Reported by: Yunzhi Ke MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58559 (cherry picked from commit 196874ce2e97e3e6425493b1d501e716b356bc36) --- sys/netinet6/raw_ip6.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index caefba22c0ca..1a1d7f37145f 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -194,7 +194,8 @@ rip6_input(struct mbuf **mp, int *offp, int proto) struct rip6_inp_match_ctx ctx = { .ip6 = ip6, .proto = proto }; struct inpcb_iterator inpi = INP_ITERATOR(&V_ripcbinfo, INPLOOKUP_RLOCKPCB, rip6_inp_match, &ctx); - int delivered = 0, fib; + int cksum, delivered = 0, fib; + bool cksum_computed = false; M_ASSERTPKTHDR(m); NET_EPOCH_ASSERT(); @@ -234,19 +235,22 @@ rip6_input(struct mbuf **mp, int *offp, int proto) */ continue; if (inp->in6p_cksum != -1) { - RIP6STAT_INC(rip6s_isum); - if (m->m_pkthdr.len - (*offp + inp->in6p_cksum) < 2 || - in6_cksum(m, proto, *offp, - m->m_pkthdr.len - *offp)) { - RIP6STAT_INC(rip6s_badsum); + if (m->m_pkthdr.len - (*offp + inp->in6p_cksum) < 2) + continue; + if (!cksum_computed) { + cksum = in6_cksum(m, proto, *offp, + m->m_pkthdr.len - *offp); + cksum_computed = true; + RIP6STAT_INC(rip6s_isum); + if (cksum != 0) + RIP6STAT_INC(rip6s_badsum); + } + if (cksum != 0) { /* - * Drop the received message, don't send an - * ICMP6 message. Set proto to IPPROTO_NONE - * to achieve that. + * Drop the packet, don't send an ICMP6 message. */ - INP_RUNLOCK(inp); proto = IPPROTO_NONE; - break; + continue; } } /*