From nobody Tue May 19 16:46:45 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 4gKgYd6kvmz6fRh2 for ; Tue, 19 May 2026 16:46:45 +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 4gKgYd5jnMz3Bp6 for ; Tue, 19 May 2026 16:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779209205; 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=+rWXXZFWTB662Q3mbmRl1JSVYYZx0QJ/rgUzmkK8AcI=; b=bO6qfIHyuurKf/NqkyUmEybxt6KTueKTcg600zRpkDGr7pTmiNodpFyfV+WWvEjccoEX76 OF77A/GpL+t81mjHN+qvHksMGWfOhucafDLwbUK4cT1DQGyp8P6v3s2x5L5ZmbUYe7Zb+w wfSZ2NRvswI9D8xFQnu/0eE2nhfgBOFlFyMn0+zTJ/nKxpammpAwDvvFR2KtECLPiEaRVC 6Zrq8jihF7AipfeV4KRmV+tfveLBsGtOlSYarjYFfTe4lF9pW9RrZjXTqSnGhb01eVwLXF +TrHFaHJHClrTlzan+vcfKgW2weoQdEShy9jxPnKBq2Fgv7vh1b5VSVr7sTq4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779209205; a=rsa-sha256; cv=none; b=ceUK5YtWuVvh7OcXPrbsYchlYk8mxrbOyBJEP4LQUPEa/+y8BW4SaK1gvJ2Cedk0Tyr+P8 tHJZr0Ei7EvGcPMmAi5PZl1I52virLvAHEwb+H7tM73aCfWhUWY7lhY7Pv+VCOYiU+6ux5 6+iE+lZ1bQA6cwxP2I3YDHRNMo4Pqr7yMildE1Qz3srHrIgOhSjH94vhnI10IcyP8577WT acFDXF9NHQHoEIrhKll8eB6llYvjbt4zXWJVWDp7t0nZAnm5+KdZ0skDziFO+0Ah8QD9gT 8zZX+8VFJGIF2CDJ4dfBrjvfNZ1nsuBgLauy89BnM/aCcI5qP9gY7kFBssCDbg== 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=1779209205; 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=+rWXXZFWTB662Q3mbmRl1JSVYYZx0QJ/rgUzmkK8AcI=; b=yO6+fjv3mJZHHgztpHTk60YjIofyqKucUKwjUIs4p6DNEz143WJB2+7l48puqmJQb9fUYT DzvGS9kr3rgWMRdTj/LjgOkgYo+Fs+zkXs4o9uElBFrq6DsMxQCEDX1Dn6j3XM6Qk2hOCX jtCT2zaywzzulblpvbN78ed18vGZ8mGylUaM/As9DGFRsF0usV8VnFCfozEspNzwWo81PL khMl6IWL1A38I/g0BXIHfK5Uz+ylvxoYhNA5XnIvGLcXvL2KpufxXOLpIBqrAC16VtBaiP ew2kc70gBi8xhzGhG6DYrUGht5vzscvOfL6xfbT/x3VWmWtKGRnQROoa0H5aRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKgYd58knz7pR for ; Tue, 19 May 2026 16:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cca8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 16:46:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 51fcd5ddf016 - stable/14 - igmp: Avoid leaving dangling pointers in the state-change queue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 51fcd5ddf016835619c94f4dbdc5b29150fc2e48 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 16:46:45 +0000 Message-Id: <6a0c93f5.1cca8.3116540e@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=51fcd5ddf016835619c94f4dbdc5b29150fc2e48 commit 51fcd5ddf016835619c94f4dbdc5b29150fc2e48 Author: Mark Johnston AuthorDate: 2026-05-12 17:53:49 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 16:46:29 +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 ae58dc0b8b04..3c4909ba5591 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3312,10 +3312,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 6966e03cc319..2ba2836f84ac 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1647,6 +1647,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) {