From nobody Thu Oct 22 17:31:59 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 4j9Y9r5jM4z6xPRR for ; Thu, 22 Oct 2026 17:32:00 +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 4j9Y9q6hgxz3Gy9 for ; Thu, 22 Oct 2026 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690319; 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=wC/pqMnac7P+Go2YGIsnsGH6zeHosN88KjYNWkpfbEk=; b=FzLW2JGHQYZ2cslmSPly6KqhnwKtArsgc3tQUnxv0VXqdkr+EnyoFBo9KpD1vlg4JOdT95 gm521sXlBngxzktT3yFLOgj3RUmEreqc/KIpZOrKLaVj01FWnZGO5/220q+YVEffaWVlBy 5u9oexkA+bP2vTexPY7vOrZRDU4L8HE7TWR3nxCCFDrNeUB13DNzm2wgePGPcC9Ctq8dnA B1sh1ww1u8QuxVW2a4pEbZtqiNwr9SFV4AJQJCcoSqrVCxRMPh95+RAkr4PR/HFnuzVr7R P9antvrCzkaIlmZrFOn3ENy/zhLl+lsJWMsogT4+L5jenE3EN6WVTLTm08dm6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690319; b=mjRXC77owcmrjw4lCLGRHEILRIogigEstY0MyjzYTdOvD2+5NAfwwLr6+GErNp9/96/PAl XghNuFBq4m0EtgEV6qjFAsq0mvPUIunq2+Ak+JySI7LdaRN+3ZcSVsLlSoiAyFzIIM7dHC U0WhEVnUbKANQ25Jx7IUNb6zfXDxUIiPA4747ZP9923F57vnJucfhoGxPWIJdxTFXsug8/ ILPq75ZfZqCegMvoDDxjtY7BSViylyr8hLhglmbY8GFqAbpcYKSFvimBCho/O5mKmKTNnt W8YAqcH+gFacNDILhpecZUwOFfkg0Xlix9NVAIGWF2JFA0YnOMV+H1fCcJ7k/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690319; 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=wC/pqMnac7P+Go2YGIsnsGH6zeHosN88KjYNWkpfbEk=; b=FnPaF2tSIyjI4GzT056yjmDnHkVS0hocksxqo5n9DZV8kYMKNoB5RPDfMdQidWoD3BqkO+ tByxrH/94Djxl+K0wI98fmbcIZEFCXFkucAn2WDqeKJ20U7aw9VNpIM4bHElWPamquRmWX elSZFsyvZf+RCxY02KFH4DCn5tEpbZjE937IIKIZC+vz5dewmZcj2Kv+EkAU1QWRjgHznB q+V/KBYy2UBjVxlVcyHSom3MF8S4OqeFfVZ27H3p4LTKNld/daonw+3UYWHIpNnH4EjXmQ thZrDLQKF5cYB/VnBRZWCgUgr3BgmV3abLZABXrZLa/wOxl+srex4QKdJKlDHA== 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 4j9Y9q6MWgzrlk for ; Thu, 22 Oct 2026 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df1a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:31:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 64c90f0dfe78 - stable/15 - igmp: Refresh the ip header pointer after m_pullup() 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: 64c90f0dfe78366655b2f3cf642b99c4898cc6c5 Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:31:59 +0000 Message-Id: <6ada488f.3df1a.70103f94@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=64c90f0dfe78366655b2f3cf642b99c4898cc6c5 commit 64c90f0dfe78366655b2f3cf642b99c4898cc6c5 Author: Mark Johnston AuthorDate: 2026-09-29 19:16:57 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +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 (cherry picked from commit dc47a6940d60d393b3d36ba0fc5cb84d06fafaea) --- sys/netinet/igmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 5549e559434f..1683f7031093 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1606,6 +1606,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);