From nobody Mon Jun 8 22:50:04 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 4gZ6gk1PvLz6gtBR for ; Mon, 08 Jun 2026 22:50:10 +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 4gZ6gj6B6Lz3C6T for ; Mon, 08 Jun 2026 22:50:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780959009; 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=OnWPsmjSqENYtXryUBk3wJxJusERkNGbRk/X/xdjzLx3TOh2IwjrWqNZyq/0UI908Xl/oD rXRjXbod5WMPpSiV/xYvkfqmgMdPLZryCK52vQjgFJWPv7W3NJ1Q6WpWAQhS/Ob79SiZzX Bw1CTRhHBgq2XHgpo/nyuhoeg0bjn7H5L1fgkl2p7PLFNasPHtEBJjCnx4Os7/fnEEaIfB J72/gZDBP/PdCL9iajGNAs0H932TX2RhhJUeabGfDA/XhjksPhxQH2EUzrCzzENcNE+bKv TdD6WVrdMwH5LLlJ7iBO+EpsMp1bV0clfKbksk+3qDUWsQRxjl/mLL68AsJinQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780959009; a=rsa-sha256; cv=none; b=AvLLUt+msU7FHtGUXjo1r3RJQNHQrZ51os+pfRFGsFKeIp5XAke4tsaAC9IWKXKAIHLsDX /pPOFCFQay/Mvwhvo5dlBszYcW+9f+udH/Hc6c9ih4nZe/Ft6B6nP5zygL8H64YYzDYDvh moPUHlJmS349aLo/PCVkR+LpX5CaY1tR1CHCtaTFAybKNuMMnyp+3d9ba1lxnG/5Kg1WTt ELlAW/Oe+Zu0QOgPViDp8AJstUAA+ocKtbbT6sCqmMpAqwWB9kRrdHNe+I+y1WYO2GOnaP XEK2mwv//tSAw5edp2ofS3Y2+E5JSfggPCpeDftZWK4DIU4H9p+eKWmx39slkQ== 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=1780959009; 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=k7dcm8HgaGeTSArhFVCAwpY4e5Q+wD9y8VwHE2XKMxS/laWGMQi9K8ZJY6ZoW38MdcVgD+ 1Dof3Ie2Dg3XleOxaC1cJEArd4vhW06li36597zNCOe4Dq0Z7s0B0/k4jSyzUaXQHjs1R6 PjDoWht6BJtub7DcFownFt90NHQE+JOa1lSHY/WMzykxz6Hbc2B8PiQEcXo7mSKcGd6u8/ TgLochssEOX7grZI1iXu3gfHgAyIllC1nByMYUutbBYcRt0XrrQihBYk20Q4tcC8Yp3sbG b8DVq5T6G1BlIOZxIHiusEpwmp77ifyiA2OJ7hWhckMDJ4lY7SaT1jmrYKo2VQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ6gj5NQCz178t for ; Mon, 08 Jun 2026 22:50:09 +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 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/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).