From nobody Tue May 12 20:06:10 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 4gFSJy3pBsz6d1hh for ; Tue, 12 May 2026 20:06:10 +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 4gFSJy1xDTz3ZQV for ; Tue, 12 May 2026 20:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616370; 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=/e7Dq6z67xH2cxMmC2kBS7Hbw6J3iPUq3Hq10flZe9k=; b=oHHGynWJn0bSPD2iJyMblSNXJooA+Ye6FgPmgo4BBCCu9174oC2gZaWVKCl6qnOdhFmjxY RNQXixjfZsSCv69hH5dyNaNyq1dD72qZJmpx3M2Wo86VkHG2cQd/JREOIhRA7tUw95UB3O gbUz4DWLGnC8UHL3ROoSFZvrwK+waJi6JXubPmUAaS57U7xys10zNaP9vklvZCzVIlx9ue r7t5n6e7TUCkSpDlv7jUYCH4yFD4JF22MY9mrJKB/qYVcmbQ3l58SdDiwa7Kb+d9mkCtnu zTd416EkRATVDol/uZhUuEKmzt8Snjx9Id+mF1YvsqWhgJwfX4S68beobMgUWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616370; a=rsa-sha256; cv=none; b=XOYFxFbtBsboXST9f7Kv/GPjFtEQKC+zY6Gkpi0Ppql4649Ki9TgMtLsC/eCRgkRnTKbRu dyh3n2otW2i23o6RUlb3qIh8qQM+pj6ExWK/7Q+p+wwe/vrArHRGescqx5edwMCxf93hcV zmEJDdTb2l2VIhYpEaQ/yC76Om8OFpQJ2SHrD+rd+hv5JPldtypYFVMzQZvt9KoMQYZw9l 2eIqSXizjRkuHQGISPcMu5zBUn4szvPQD9OMPEMIkRYerqtQVvGpeXChhVbUKHXrdYsPJI ZS/jDCO1BiQPNqXRjPNOanJoMI6aeH+RP4baQBnSCymrAMJ5zLH1DR4iYoXKGA== 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=1778616370; 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=/e7Dq6z67xH2cxMmC2kBS7Hbw6J3iPUq3Hq10flZe9k=; b=c4UsGbNPTrxj4Ec8/o1wtYmcpXuOkaujC5vTwvLpdLgWfZDvFNBH11Dm8gRBuVwkeIvenP AvcHu0DV1g9emgl2KFnxhKUyciMGEt5VLwUVEJL5DgUesi3CUhL7vvvJ+oSKD7WzyFm0fL a216pHtrmSAJqDAFRRM4Af6i9yzEbA5O3iumiay1oKKsGFWYannSaf7b68IWaFRFQSlbGz iQlod2Z1D2YAjOyxZ0kntyMc75ibn920TMqbIrhKGuRvcfRriols021meXN7tU35DXMG0H 6LGmpjWTXVnS2E7MEB2osRW93Z/wmGacX+wcWgOgBQjKmJXRMNtgFMUPr+a1Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJy1XzFz2mC for ; Tue, 12 May 2026 20:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: beab4a237a45 - main - 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/main X-Git-Reftype: branch X-Git-Commit: beab4a237a45aea809e81802b9e1e9ff30f3d929 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:10 +0000 Message-Id: <6a038832.22e04.6ba24256@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=beab4a237a45aea809e81802b9e1e9ff30f3d929 commit beab4a237a45aea809e81802b9e1e9ff30f3d929 Author: Mark Johnston AuthorDate: 2026-05-12 17:53:49 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +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 --- 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 00288356cb1f..226f38a035fb 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3326,10 +3326,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 c5072cec904b..fb1a0a5b81d0 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1656,6 +1656,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) {