From nobody Mon Oct 26 19:46:54 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 4jD3zg2Vgxz6xWhJ for ; Mon, 26 Oct 2026 19:46:55 +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 4jD3zf6HZxz4qjb for ; Mon, 26 Oct 2026 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044014; 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=/QF1ZyGXSHjTSNs1oogXlGkd2qgV6HZg22OoukwWruo=; b=WdahSM8Kg59BkPhBHXCQUMUFlj1hlylCw6GLRji6vLept3sg/kIrSEMbDDXup3+a147EKb dOR6fDr91Jc0UlX2Uff7FwlxKt1htRuUq/P20V0ojeqjah1X6lpGq+LTTewr++A8CWhJ07 czdI9TcF4hWYRRUmsf6pz4PletqbkNC4fIiJ0uLBsVjNLGDDfvSYJHRQdjCgnSMUFwR5MS GGOpEyPyw4Zz6d84l8zXePO6e9Q9z+NTk6aqFcUjpUxb7zs0saP8O2+APN7+r6HrUBYGfT V0BdEQcggenf+7Fobs9tAQjyMqqyKr36zXEwxzt9dif2DrE8Zn+n62/0z5aP4w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044014; b=HBEwLsplOilGNAKhPBVchnCZv5RUuBenUhZhl7rDdPgt+yEzxsdJL+J6U5ftGC0Blo3xS6 z5S6YfsqYoxK2UV14hYVyImYfqXzF4deSLcZqVt1gvhDWPut2SnGeRC34EXHEYXMFLKlvQ gkdcMK1Zk7t7iHe9DpxADrCy0VPGwi3W7Aqbf1u+mIVW4goMZN3EZyAVBazXCaN76/PnOX TAAyJpQ8QDkzax2josdO/Rij9djvtO6P7sFCGuCpkTequnTjKpIcpAH04FTyA9QPtFBxIY z6mwpDc94NMMtDoLKG+GNnwSGre+OGF1W9fnemI1zrczNRXDyPMp8ZDQGbNWpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044014; 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=/QF1ZyGXSHjTSNs1oogXlGkd2qgV6HZg22OoukwWruo=; b=csKnx2ke036qgZ3svebriRBy9E0yLHhdJM8sHqSfbd8RmoX5AU7H28bpYq7k2ISYmlv7ha TwQFG2u3kH6YOS5mEOvB1FwflD4UMZsbJIy8t3y/MZ6bmF1NdBZOqDYXnHQvMb8ygSOS4f 0sATqFxq0zE7gS52EICJUb5su2di7JAdbP5DHvJvMjEe1Dvag60uQbfRgFIfdGG9bXpYPr 8JonAxCkrTKjI17BtrbyID2N6WZto/SNxeyxtiKe0WaoRQbkhZeXbxPZRKNf6ebGLY7LwZ 0NsjwfvP0BlUp5t23p6HoCqR+kzCnHfnYTauj+AW8c2wwHrLxC9JvinxcqZllQ== 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 4jD3zf5y71zpPS for ; Mon, 26 Oct 2026 19:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:46:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 17b457d65981 - stable/14 - igmp: Refresh the ip header pointer after m_pullup() 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: 17b457d65981a6720b56567335aeb860d545b90b Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:46:54 +0000 Message-Id: <6adfae2e.39422.5e7bff1f@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17b457d65981a6720b56567335aeb860d545b90b commit 17b457d65981a6720b56567335aeb860d545b90b Author: Mark Johnston AuthorDate: 2026-09-29 19:16:57 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:12: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 (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 e8541e1c50e4..643a97c85c51 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1595,6 +1595,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);