From nobody Thu Aug 20 17:53:52 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 4hQrf931vpz6pFRj for ; Thu, 20 Aug 2026 17:53:53 +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 4hQrf91W5Hz41VJ for ; Thu, 20 Aug 2026 17:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787248433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edQ85rlMz7x58jGJhhSPhOOA+m4tNdvhuqGcfQLvMt0=; b=FO4LN0Wg+/negv1maVFqM5Nl2D0dPH4S5KCilggnOs85TuEz393RLSTbaZItdWJ9M4xzUn wvQ8VcH6Sga1IIBZUrmo/MQlVmnSni+RXHClmfm6l/1OY57tQpcYDp2sltoZgS4cbVrVMs AfncT40Yw5eKk4vQtbTeSuPirfZOSon/r7RA/EHwi1xLHB9ZcmA6jtyq280H9kX8W0nz7V Efe+IO07xLViuUB6iO3Bm2ikhjxBR6O7lcuL+Cad+XXwzd/6y5O1SO4tBC/B74e9Lz7Cw5 dNGlAlEFqGkEFmEPzBlaX4bD38F3dtKIYivHSsiKN02mRF/uvrzgpXVWvtrsPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787248433; a=rsa-sha256; cv=none; b=NRJuWo8DYI7kNJYuXHTJ/l804QO6uCjxM0dzRteyEN2o0DzXbN1Xm6qroHug9g/hpYjB3a qjkYgFPSw3XxCcCx//H3sQCx/4oZ/tRBMfeW87iKwUIx7Asopn+jBqLc0JL6vvIwlgVxos X6chbphzAPND2Pvx02AKnvoFy6a1/CRJDNu0Nx1jkPyeZKeH4k5M3l87WvFtgTz0WnvsHk 3Fb8egue7wIfPZ+cpukw6amSvBsTtLaQMkxGKNLFj+O3IWxLBICeoJ5bGgtTakQNlDZvP+ ChE6C16nEVNXc1Ea7nCDQNCxSEWF/kwX9VXM+9tMlqRv8yXmCUlsfb+YUpS1FQ== 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=1787248433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edQ85rlMz7x58jGJhhSPhOOA+m4tNdvhuqGcfQLvMt0=; b=UVbc2oivq33UGFq4Qw5eqZBSU8Jkm24vgH4rSNKa309N50t6ddzAZV15d8iSBkd1rQGJpw 2K3WP5ltPRFvPXTT3fBPWn8MevwhhJCACxGFV5TPZLubF9QuuBDDKRdvyWY+M2ngH3pYjZ PF5Mqp/61b30QKoh79UPUDbVawfkukdW2gfsVeTnjNOhsbPUQJ28/71x0dVzjQyUwD5zUS LnGYcqdYWnMyqnl3uWH1hQC4OwWLaHKbTVlGiSPqpt9Iy9stnmqtRkv06T4K8Hlj1223vk 6kHIpX8a2VKBz0kKjYCfQuKkve9wkCaqOpA0wsONpIhMOteTNX8m8/YoxIIOTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQrf86hfkzC1w for ; Thu, 20 Aug 2026 17:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45063 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 17:53:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: dde557209adc - releng/14.5 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: dde557209adc390e4f1bfd29db0c639ed162e379 Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 17:53:52 +0000 Message-Id: <6a873f30.45063.12cde4@gitrepo.freebsd.org> The branch releng/14.5 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dde557209adc390e4f1bfd29db0c639ed162e379 commit dde557209adc390e4f1bfd29db0c639ed162e379 Author: Mark Johnston AuthorDate: 2026-08-04 13:35:35 +0000 Commit: Colin Percival CommitDate: 2026-08-20 17:52:51 +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. Approved by: re (cperciva) 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) (cherry picked from commit 1fe3a2897b4ad7a9b9128efd6ec0c24b371bf5bd) --- 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; } } /*