From nobody Mon Jun 8 22:50:04 2026 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 4gZ6gc5Vlyz6gtBP for ; Mon, 08 Jun 2026 22:50:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZ6gc4zb1z3BwX for ; Mon, 08 Jun 2026 22:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780959004; 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=Znxe6amMgO5XT+91L5M7/T55MAhSmcDovlNqt4Pf858=; b=Afqlnq/CL+4xET+QHqSfINVHkB4P6zbHghRBb8kH86GNYcmytVXViqnwxZgjNI/vYC/XzB kclYTBim+WMpx8uuxVL/Sm5wlQ7n/VYOE1EpacammkLSyDPhG0Djz6UXMU09hre/gFvfl/ HQJ9PEwo5Te+BcFANPoF/9a3bK7pMgXYL+tJ8sig7wOrE6XwcHV4T49Jxb/XCdDFNipjsN Z/BbjMdfXrGirlox7YuoJtzoHKKTm6hr4RloBWt4B8wAEWB0dNEKTvcYiBgyoMYiRqF+L2 uZo+XU9/ULlUN6UIMJYjpDEm7PpSMREQEIOnX22ZIK8lKY1eD5pTeBFGbwtmYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780959004; a=rsa-sha256; cv=none; b=ALJyinoFBCKid9HdKTA6Z9693rTzMpQBf0avs3TM8Ef5YVTGVoaZEIiCwdY8OMKObm8HHM ip69sT3oboAgRYA5rG/zo19bQIAXCtsZ+mQuZlpJKRtG/TOZQvTybuFsroo+HjCz9FLeU7 WqgRLidZ2giozvt7dlnGupRlHxLXFw+qbkhRu5VjiupBRK4CDWeDNKMvJjnvz7vjPSZEE0 V6fYo6MoOdruJxpwiKQRncMRuXLtD0Ly/kL5cZNFBtosOx0ofOxdZxvXryMzm2DgyKuhGP ONdYtBlwOYRzGbhdW4H5Mpfve3UGMeC2kD2e8BV2MrGNPaM4X9ZrRikQdvMyCg== 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=1780959004; 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=Znxe6amMgO5XT+91L5M7/T55MAhSmcDovlNqt4Pf858=; b=f0nAsv7J9uGyIdhHNBCpU/QP6jzxBNihHs5WGVnz4AVItdAcf95QVd7N6c5TZrvsUzBCaw GNMzTRE98dx3K+XT5mJfjwd7cHf4p4CJxL3aWOGotru5V+je9OEEkELDPlPvCSYlRYAsJO OK4LuGQ8SgccCOQSO/wLk4VlFQtCkS5/sxrLjPxiuSeI2/UBzZfHg+Ji/5Y5VBQFqUsLsy TpnnEsKFNLTbqzismTM38wN+Ho81HQnbANKNnNQ9ZYukqCvtFsc0PIY4N54ejlQFCOyeUq 3TA9f+ZWdv8Ei/GTMFOX8UUq6+Dk/tPFDERIxJ513pR1RDs+20jl4S/W8t1VQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ6gc4b4dz16vw for ; Mon, 08 Jun 2026 22:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23c43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 22:50:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: acf0be6e5192 - main - ip6: Drop dead code in ip6_input_hbh() 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 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/main X-Git-Reftype: branch X-Git-Commit: acf0be6e5192c8b1ae2c9a71d86828daf12317b2 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 22:50:04 +0000 Message-Id: <6a27471c.23c43.33d849da@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=acf0be6e5192c8b1ae2c9a71d86828daf12317b2 commit acf0be6e5192c8b1ae2c9a71d86828daf12317b2 Author: Mark Johnston AuthorDate: 2026-06-08 22:45:44 +0000 Commit: Mark Johnston CommitDate: 2026-06-08 22:49:51 +0000 ip6: Drop dead code in ip6_input_hbh() After commit 069a67374ed9, ip6_input() quickly rejects packets with plen == 0, before ip6_input_hbh() is called. So, there is no need to check this condition again in the helper function. Reviewed by: pouria, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D57342 --- sys/netinet6/ip6_input.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 0dae879c1bd5..426b81dc9c03 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -421,24 +421,9 @@ ip6_input_hbh(struct mbuf **mp, uint32_t *rtalert, int *off, goto out; /* m have already been freed */ } - /* adjust pointer */ m = *mp; ip6 = mtod(m, struct ip6_hdr *); - /* - * If the payload length field is 0 and the next header field indicates - * Hop-by-Hop Options header, then a Jumbo Payload option MUST be - * included. We no not support Jumbo Payloads so report an error. - */ - if (ip6->ip6_plen == 0) { - IP6STAT_INC(ip6s_badoptions); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_discard); - in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_hdrerr); - icmp6_error(m, ICMP6_PARAM_PROB, - ICMP6_PARAMPROB_HEADER, - (caddr_t)&ip6->ip6_plen - (caddr_t)ip6); - goto out; - } /* ip6_hopopts_input() ensures that mbuf is contiguous */ hbh = (struct ip6_hbh *)(ip6 + 1); *nxt = hbh->ip6h_nxt; @@ -760,8 +745,11 @@ passin: * We don't support Jumbograms, reject packets with plen == 0 as early * as we can. */ - if (plen == 0) + if (__predict_false(plen == 0)) { + IP6STAT_INC(ip6s_tooshort); + in6_ifstat_inc(rcvif, ifs6_in_hdrerr); goto bad; + } /* * Disambiguate address scope zones (if there is ambiguity).