From nobody Mon Oct 26 19:46:53 2026 X-Original-To: dev-commits-src-branches@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 4jD3zf1Q12z6xWdj for ; Mon, 26 Oct 2026 19:46:54 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jD3zd6H5Lz4qSH for ; Mon, 26 Oct 2026 19:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044013; 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=QRapekmw0yz4tlzex+M3zdmoiiwP3Zdq3c9WaGcbtxQ=; b=ONmRRUrYxNOo9jM9r0W1Lp3W5cbS/crLNB3oKjGeB+S8s20i/ImEyvFI2RXGW4IqcaQOzq QRvqFKrarvwGxhkr47rZLH5NMxYCtvXHrbBwz+tKmVovuXuzj/CmkpPbhQeOdeuZTQNXe2 P8uZWaLYUXKfgsxZDLABHDOIViaRy8g/sAHmyiTBojQ7DkDgNWfv470FUb9QyFw18XWXHq bwCyiKUzxnGDH0GLJ8L08UVwnXf/6GSCAvCVGrubow0bs3o1Fcj2XPZSFeJHB3luJuKo5b HRkU2sOGAyI0xRqquztZ8DeGdCcNrbZwSKg7RnKHgqva6FDMzUA3iNYdq2FCyA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044013; b=s9LgqG0pmYy3PNntt7spXqN40LSvxlOx+btcCQfhSedC35ihg95i+sj9cjbVg6OGHgsMob Od4kGI/9mR09LNA1g7awyFuIsYsxCAlvlRhKfIw6Jq+gD3MhvSmGJ0VKUjKat2WZHG51S3 BpQmydauKbj0qQz8NEHVav9e3KtBSSefDsR4uXyfUDdi6eJGkyyKmsic9CMy148C5ZTFMv wPYsoqVkI2mtj49ZQTWFPTRn3CsEy+vJuvY1oh7IzII3YZDWJQn/7bD+S2RNoclOF4wGeF r7l8mWD7Iy5PQQ7094z/fbeZ9cgdLLIZJ5jq2arY3AnLMWTVO/P5ieFAahYG3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044013; 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=QRapekmw0yz4tlzex+M3zdmoiiwP3Zdq3c9WaGcbtxQ=; b=mY42CalgmJSLb8li5E+yKEaP1Ap6uxPjZL2YtdvTNwE5hpiU/iGqWLQhs3b5PEN0SsbO8g 754/3UOznL6HdMFYR1TIdl4C/8o28AY86uR0ZHTrN108xKnZEoq0ocaX9oRIGtabufIkGM VOeNmCdEE1pvbcOsbxKL6e/XbQiYIIHiPEJnU4xMvLiD6xtiBOelws79exmK87Zl0JQRsa xDku82UIkX4T7aZeTdgWNwGiibWDv4RApZdZgUz3hjLopBqWNprAerE3IaMumlK8LGkt1n PzVKx3vh18iaJeHnicjZiTnkBO63U236+RZTExJ1IudOB+XtvLPAxwAudNkvNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jD3zd533Xzp14 for ; Mon, 26 Oct 2026 19:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 383c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:46:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c27569419c02 - stable/14 - igmp: Deindent some code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: c27569419c028bea792fc0210383981144709a86 Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:46:53 +0000 Message-Id: <6adfae2d.383c4.67f58deb@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c27569419c028bea792fc0210383981144709a86 commit c27569419c028bea792fc0210383981144709a86 Author: Mark Johnston AuthorDate: 2026-09-29 19:16:37 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:12:15 +0000 igmp: Deindent some code No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 123342f3d2cccf432d3d0082097b6c97397ecc67) --- sys/netinet/igmp.c | 67 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 3c4909ba5591..e8541e1c50e4 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1567,43 +1567,42 @@ igmp_input(struct mbuf **mp, int *offp, int proto) break; case IGMP_VERSION_3: { - struct igmpv3 *igmpv3; - uint16_t igmpv3len; - uint16_t nsrc; - - IGMPSTAT_INC(igps_rcv_v3_queries); - igmpv3 = (struct igmpv3 *)igmp; - /* - * Validate length based on source count. - */ - nsrc = ntohs(igmpv3->igmp_numsrc); - if (nsrc * sizeof(in_addr_t) > - UINT16_MAX - iphlen - IGMP_V3_QUERY_MINLEN) { - IGMPSTAT_INC(igps_rcv_tooshort); - m_freem(m); - return (IPPROTO_DONE); - } - /* - * m_pullup() may modify m, so pullup in - * this scope. - */ - igmpv3len = iphlen + IGMP_V3_QUERY_MINLEN + - sizeof(struct in_addr) * nsrc; - if ((!M_WRITABLE(m) || - m->m_len < igmpv3len) && - (m = m_pullup(m, igmpv3len)) == NULL) { - IGMPSTAT_INC(igps_rcv_tooshort); - return (IPPROTO_DONE); - } - igmpv3 = (struct igmpv3 *)(mtod(m, uint8_t *) - + iphlen); - if (igmp_input_v3_query(ifp, ip, igmpv3) != 0) { - m_freem(m); - return (IPPROTO_DONE); - } + struct igmpv3 *igmpv3; + uint16_t igmpv3len; + uint16_t nsrc; + + IGMPSTAT_INC(igps_rcv_v3_queries); + igmpv3 = (struct igmpv3 *)igmp; + /* + * Validate length based on source count. + */ + nsrc = ntohs(igmpv3->igmp_numsrc); + if (nsrc * sizeof(in_addr_t) > + UINT16_MAX - iphlen - IGMP_V3_QUERY_MINLEN) { + IGMPSTAT_INC(igps_rcv_tooshort); + m_freem(m); + return (IPPROTO_DONE); + } + /* + * m_pullup() may modify m, so pullup in + * this scope. + */ + igmpv3len = iphlen + IGMP_V3_QUERY_MINLEN + + sizeof(struct in_addr) * nsrc; + if ((!M_WRITABLE(m) || + m->m_len < igmpv3len) && + (m = m_pullup(m, igmpv3len)) == NULL) { + IGMPSTAT_INC(igps_rcv_tooshort); + return (IPPROTO_DONE); + } + igmpv3 = (struct igmpv3 *)(mtod(m, uint8_t *) + iphlen); + if (igmp_input_v3_query(ifp, ip, igmpv3) != 0) { + m_freem(m); + return (IPPROTO_DONE); } break; } + } break; case IGMP_v1_HOST_MEMBERSHIP_REPORT: