From nobody Tue Sep 29 19:23:24 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 4hvSl04QFhz6v0X7 for ; Tue, 29 Sep 2026 19:23:24 +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 4hvSl02zhmz4QFL for ; Tue, 29 Sep 2026 19:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790709804; 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=GGYCBo5uMgntM7jAbjBT5GeYJBTx1nWc+V2wWaCzkrE=; b=jhcUVjS0QNFxh6Pipg02YS8mfrUGoa6j2x/dOwbIY9h8lCkjtEv6Z0+arrW+WTO1oBYyEl YIUCcvW9+bC7s1Z8qVUz4nGlqSfU38zLrggXfmI1uOv5aN98daiTvQKsqJWuKVOIAfuvaK 4h5Lf5o88NNLoqbluGeXPNjFVJaINmvU/SS5/QHDhSa2DyqXlvqCMN63JM99KpU0jowxxQ oIKOImCN5G9JRBIeZeT/yXBmXPNpG84VUStikH9pKDVQmfZ8ai+ni+Ahp51JMonaOLGINJ 6x9/iHoExqwT/e1l7D+rSZc9e3a2xGFYg4X9sZ99bDUCRp6DiWLHM4VAqiWyBg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790709804; b=VP/pI8C/4UrsA3orOP4v930g0zpHTJBvdfd1CYFRz5kD8wxRyWPxNJOXsey2eF54dKqHaH mvpgRDfDovwRaELERxFci3SerN7eO4z4tCmfrYaq4p5C4zmJJoF45jtJvaWHQk6g/mzm1q /S7aushjfgJ7gFQLN53Vm8ocECXtmktgX1YB6Kj41piRhqiamM8+g6Sa/gao88VVt3qFCR GymZRb1+2lWHkFDdTCAZYGbIq858HT84R3Tn4QdDxGQ6iTvreiEifyVOfxbgcicOpc7Smu W+lMDkcfw/k9Kdq2JD6ryfI/D1ESR2ozxhmmTIXQWluioucdqK4MB11TWDCbWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790709804; 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=GGYCBo5uMgntM7jAbjBT5GeYJBTx1nWc+V2wWaCzkrE=; b=fXPa8mqJsCqKPqsnKaeP5st2Q1WLgt1dZjCzHv7z6SDZBReqTA1hbmZb7MDu8q7bTAV0Ug fRy/DDLbiTEmq21QZ9/wObhE+bNFeaC+MHqsYfXWsXtMRtz0uJrtZvcpZNl31Jx/IoUO3Q senP2upFDqeslGerryKv7A5nXsCXN2qVumguZfTUE6UrEwYwpfj8kjmzx1jelVN0psYBLO hjH134UKHf97OL2km54g6Dj5xK2fJYOtY3+Pb952pG5CZuw50F7z8t+YOn6Ugo/5ovVMbu kp0dWdngiFSCNzwuucPhVx7cskTDfrPhPR8w3zdxknBnPg4sVsUzGNjXFYGprA== 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 4hvSl01wdVz1QpR for ; Tue, 29 Sep 2026 19:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 458f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 19:23:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: dc47a6940d60 - main - igmp: Refresh the ip header pointer after m_pullup() 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: dc47a6940d60d393b3d36ba0fc5cb84d06fafaea Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 19:23:24 +0000 Message-Id: <6abc102c.458f3.455dfdf2@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dc47a6940d60d393b3d36ba0fc5cb84d06fafaea commit dc47a6940d60d393b3d36ba0fc5cb84d06fafaea Author: Mark Johnston AuthorDate: 2026-09-29 19:16:57 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 19:23:15 +0000 igmp: Refresh the ip header pointer after m_pullup() There is a chance that the m_pullup() call immediately above invalidated the "ip" pointer, so refresh it as we do with the IGMP header. Otherwise the test in igmp_input_v3_query() for whether the packet is an IGMPv3 general query might use a pointer to a freed mbuf. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/netinet/igmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 8c09a37963bd..5c6c46a4f4f2 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1605,6 +1605,7 @@ igmp_input(struct mbuf **mp, int *offp, int proto) IGMPSTAT_INC(igps_rcv_tooshort); return (IPPROTO_DONE); } + ip = mtod(m, struct ip *); igmpv3 = (struct igmpv3 *)(mtod(m, uint8_t *) + iphlen); if (igmp_input_v3_query(ifp, ip, igmpv3) != 0) { m_freem(m);