From nobody Thu Oct 22 17:31:58 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 4j9Y9q0TQTz6xPTh for ; Thu, 22 Oct 2026 17:31:59 +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 4j9Y9p5pJ6z3GsN for ; Thu, 22 Oct 2026 17:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690318; 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=5m2Byokp6lslQ69cr/8QlNXPF4fACHNV/5xeEoNFeac=; b=JQZG0+MM4D0RA828tRyoH4etXwDXMDvveBsrJmuWTKOS/DNUYqXna2Uu6eazhxJWE/ToLb UIlToCVdGQFHnJCfx8sX5r1lE3CLyaqOWWi07DVQVTZuI0XquMpvvsjsm546jNFcqkeG/U cCMuDoGIkq7f1Pa8CltVyhk9JIl0kPCkW4x3hH9lGza4QcuUyN0V/g7guTJXPZe09T6OVJ Sn/8H32LdLl80C4i0MD5yAS/G+pvJsOgR4dvnAgmDpnT8SqjmFastqIQzHKlbrWDpLPSdB JmUS/INOIkziJCpNDSZYOG6RFzQMI4tBAyysOfWAbC+e0JQKwYaf5neYGsaUMw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690318; b=gdsgBQGqW50kZjm2pxUskfsimxvkToUJ2s3X1aw/rgned/D/D73VlJKkuIITh+JiTMCnBS ZyTbtKUUslqMvbfHEvAnvyzh5Jrf2e8PgrsJWIPHqUungvUSAjoRDHSgiQ09zOEzO5kt6J 5L/JeP8m94KY15nki3hTu9zx616YkvX0QXMbBQRvESf8yIK4DnfYjPLRBHvk8hW1FIoSIE QNixQDVXteHC4kLynQ2m2KLoXC5OFDyLuGhneaXjxCoGy18hnlj/0CdjJ3lQ34CiM4znsT yZRvm0h1f11D+5vChEcN63hwTGTKemlhfS5rvPFD7X3tKU2niXnBRBbg4n7NHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690318; 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=5m2Byokp6lslQ69cr/8QlNXPF4fACHNV/5xeEoNFeac=; b=N3jwXNXwDaRftBvU8fPaRho9uI+zkxT1mq999CABlDS3G0QaQYamaBzz5/Phmm89bAi07Q dIqeG9nsZjtp68Zv2pPXoIuM5gynSApUV4eC05bp2xEDSyA+PDHo2/3PKimOOfA+eeTBHK TVWVehpKCHJvP8CbRwNQDqcxEnr5joFvSacRvDT4ugvzY8B3HOdIbmdzBiuYas8y4EMFWj HMIGrhQBStbclQr3I58yFYMovBd8MFZxrF9v6ZISj7/lOmBKJOKVVTPZiqTmWrvQdE6i7V JrwgmH+YOhCMfZd5jAs3j8rI2I9/a/Vf8z3BVaN9PeOu3muaIaPYiwfzc0mflA== 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 4j9Y9p5RPCzrlj for ; Thu, 22 Oct 2026 17:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:31:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 00702769de2e - stable/15 - igmp: Deindent some code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/15 X-Git-Reftype: branch X-Git-Commit: 00702769de2e23504da9ca2eb413cd2e91556c97 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:31:58 +0000 Message-Id: <6ada488e.3ef05.4c8c0f3d@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=00702769de2e23504da9ca2eb413cd2e91556c97 commit 00702769de2e23504da9ca2eb413cd2e91556c97 Author: Mark Johnston AuthorDate: 2026-09-29 19:16:37 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +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 5d52abd32c21..5549e559434f 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1578,43 +1578,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: