From nobody Tue Sep 29 19:23:23 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 4hvSl44Qgkz6v07Z for ; Tue, 29 Sep 2026 19:23:28 +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 4hvSl43VtLz4Qpn for ; Tue, 29 Sep 2026 19:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790709808; 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=g5f+3K0ju9aodENDPSDj6jBtu0BKmkhHI82YE2a8xcE=; b=kqPlFFd2O3bivwBKogZzCexEKb476gUCejSGR1LZ1AqeSx3i3hOmZI4uhClRhd23X3SH3+ XbZoA/nvDTvadlwXZhTPkYYSf9p30spETvAw/VAyyAoWa7FgJ/01OuEaWqfqJYSMsNvO3w Odtyfmf+aQXUK2Ad4lBzVJH52CM8QMuDc2BZV25K0s+adk768+i2CSbjz6OYvw8bJbe4w4 zEMaYb0YRrdWC7uQEBE0Nbz4l9keHM6dIvbErfSxW2uCcYcLtcBSdsxQ4p3InV1VtJblC+ aUH878DkAurNXMNY6M8ezs2p5HEzE61lw1VKYvIXb0X5FsOoxCDlva6PP6IVlA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790709808; b=PNRtal1ib3OtyS1CQ8IqnADeNBM+qGMfwfRsPAABDFelLztxf1W9TAddUmc01a65LpplXs iMgb0wKI5phczKZ8/j+Q5O6HwxAglpx9puxQ7rVLJioqqT6gxI8mJNHc8GyyXkLtBrIpBK rX0IL5niU3/LonPQ0lAknaZlScUND8jrZ1ex3KqYQ+KB9EGZAww4KAHEYSlXltuITIPsuH 7fGvtD6h973kpMx3OmeljlXnaJSkqowCkKqNTZcLp7wVFmcu3No06XKt1NsDPIK2tLD1t5 fGfrGL3s6HJwEnWoqeSwKqdUyOzcdFE8TjqM9Nkb1WqW81fKcdO++XKikxryTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790709808; 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=g5f+3K0ju9aodENDPSDj6jBtu0BKmkhHI82YE2a8xcE=; b=iq13/w6rFaeJhYa/OmOB3PkUnjJU+npUKMpnt/A5mhdfJjsHPSL21OOve3Ajujt1rx3Stc xNo7nkza73M6GI7A89VLxNRPFvSYZF+mqrBJB2Y9wD4Mt/doHHVKQy7RBvho/X0T/XaIjm VSOhMQ1u35L5qwceOvFWmQjc3FxKhWy2dljm6hSKMDrMMZvoQ6nNQMtJv8CN4Y0FS+s/s6 5TXUBGtp52cLpWFcTQ83RToovRlQsSWKh/87MGz+StVADpx/5SjFMTBPSXIt/o94Vuoz1F KW93dOPN0z+QdjSmNVZDQyZv3+fQAJRc8v3xPvyYgPAPdqaLKH7+zgwqifftVQ== 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 4hvSl42HsKz1QpS for ; Tue, 29 Sep 2026 19:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45c45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 19:23:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 123342f3d2cc - main - igmp: Deindent some code 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: 123342f3d2cccf432d3d0082097b6c97397ecc67 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 19:23:23 +0000 Message-Id: <6abc102b.45c45.605db01e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=123342f3d2cccf432d3d0082097b6c97397ecc67 commit 123342f3d2cccf432d3d0082097b6c97397ecc67 Author: Mark Johnston AuthorDate: 2026-09-29 19:16:37 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 19:23:15 +0000 igmp: Deindent some code No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- 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 5ca5a4575026..8c09a37963bd 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1577,43 +1577,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: