From nobody Tue May 19 14:08:49 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 4gKc3Q1cfYz6fFmD for ; Tue, 19 May 2026 14:08:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gKc3P6l9zz3hS0 for ; Tue, 19 May 2026 14:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199729; 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=nuH/ePrqhmcR/TKsJOdMFWinpMLnoq5vTMKHZYNH43U=; b=n3ndNeRPZFFAOMDPZtrxdUrESe+bi0pnPXaGcxl0UyeHyF0VqoSOahlMb4EKZT7vqnY/1P Mp2q1mMjdGWT9CIz5AZcSgR+R4i0l94YfJNR0sKgn1vF0t5x7GEq/7h032pPVB58gFNsL/ OCDIPozqL0k+sgRip8clEmrCo/9s7046It4eHWqdpQeLG8ZOEToPNVWJPNRAaO0o6qDBnD B9ujGhNP9CkqxyuajNgMMYqm70Waf1bHoW3heI2ptSAU1sD+2QJo3BuM2i6ypB6j9UKhbT XeYPABlZAUH+155STsVkkaBPIr7n6wjwiw8bvvsUThGivaRa9x21DLvIDx4p0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199729; a=rsa-sha256; cv=none; b=Fm6MXvF+msOuJz3jiYqpvMaHkeJYR6wogcU0u7sk0b7VG9H9Ci/c0wvTmj2GgQCxuerwX+ DfUHaGyFCIOeZ7iWSjPUuaJJYNGHZZ/G9Oe8uflfBkpOU5LLJdG09/vWtgwdtm/xBRQ7M9 Vcf2zDTWji5Qfr8420RXEPzwdZnqjtiB5u6GHzaMemBzPUNqKCRJUWG2aQ7OxCWOq3RIxl qKMQKSyvxwNyBuOAZJdrZuqA4USetLM9umoVBTzQhOhuDzJm5Ao/Tvxh6JgKt2MWD8OY1C s3URrX1Y8gTYZAj7egDpf4HKuLZ5SLfVQ5qghRUncRmhlDl95AM2ZeUBRDKbDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199729; 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=nuH/ePrqhmcR/TKsJOdMFWinpMLnoq5vTMKHZYNH43U=; b=cX4+AxKRzoLPjJ/gJEoOnHyOUTZlgdvXcCAtr2V9470M5ZxNfnzWxhgfqDEB4Bzud19fh8 4e6WoNLr0bQl4SbYuKAOqzYT4fw9IoutMTKK0DeNEehg3mu5t1FbuXQIh0X0+IEc96lCXN KH33xmmI56deeHaF2+WT6A7Mz4fpNdp8NeqNwAjhWjxdmSjI2koZhu0pNNIltufOe79+k0 ZJUTLgCXIQdVSf+dEnmDi5He6ISrJgpPmKuH1ODrixnqOOa+rmhleaReon1i+nlH3w7R0D bT5qroFqgxbVXmU/WILsOW6uWPeYmDmB4DTWX/00Ny3EBrQp9mY4phgQg0EWFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKc3P6B9xz32T for ; Tue, 19 May 2026 14:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:08:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 54e213d95ff5 - stable/15 - igmp: Avoid leaving dangling pointers in the state-change queue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 54e213d95ff554190359fb0ae07927eea8e55d1d Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:08:49 +0000 Message-Id: <6a0c6ef1.3be0a.6234626a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54e213d95ff554190359fb0ae07927eea8e55d1d commit 54e213d95ff554190359fb0ae07927eea8e55d1d Author: Mark Johnston AuthorDate: 2026-05-12 17:53:49 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 14:08:32 +0000 igmp: Avoid leaving dangling pointers in the state-change queue When igmp_v3_merge_state_changes() is iterating over state-change packets, there is a case where it'll free a queued packet but will fail to remove it from the queue. Fix that. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56947 (cherry picked from commit beab4a237a45aea809e81802b9e1e9ff30f3d929) --- sys/netinet/igmp.c | 8 +++++--- sys/sys/mbuf.h | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 63a44bbcfb7a..5d52abd32c21 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3327,10 +3327,12 @@ igmp_v3_merge_state_changes(struct in_multi *inm, struct mbufq *scq) CTR2(KTR_IGMPV3, "%s: outbound queue full, skipping whole packet %p", __func__, m); - mt = m->m_nextpkt; - if (!docopy) + m0 = m->m_nextpkt; + if (!docopy) { + mbufq_remove(gq, m); m_freem(m); - m = mt; + } + m = m0; continue; } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index f9141bf70742..8a0a8e31d5b4 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1652,6 +1652,14 @@ mbufq_enqueue(struct mbufq *mq, struct mbuf *m) return (0); } +static inline void +mbufq_remove(struct mbufq *mq, struct mbuf *m) +{ + + STAILQ_REMOVE(&mq->mq_head, m, mbuf, m_stailqpkt); + mq->mq_len--; +} + static inline struct mbuf * mbufq_dequeue(struct mbufq *mq) {