From nobody Tue May 19 14:08:49 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 4gKc3Q1cxGz6fFmF 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 4gKc3P6pLWz3hPW 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=1779199730; 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=Jte3fYyqyZo8N/t+lW86NApcQraUTY+Ug60vdBwtJUsCwRtah8neA5z+pSCWsdVsUIdXZa C12sdMuBOSPvfI++IMgc4+8koBdyHouVFouhTrdv/6G68p5t8tX5iRBFxKHzGdi4OowBDE sMk/H15Y6KqGJnmbsk1lTR8yP8miDGPbQOoHwKIDglrK1uCrML6xdOH3nGRLV0H9rA11Mb NLa7BXn1suf/TSVgrmy7DhkN/qHu2pS++mViM2vs9WZlGusH4PdfCQX+v33D2eRPoMf4rn LT76Xz8j6lTWjF0XzK8RJHvGtz0ilS4nPKFDuRpwer+vNQA5oTvcEk0OdXkXqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199730; a=rsa-sha256; cv=none; b=qpZf8LehaS8px5fVYL1QF1Z8/QWAoBf/3LDLDdVevUQrkRg7MnXwT1zl/JrH/wZrVlVw5J 1o290C08anhyQea//cm0wH7yEvPYtjKtDW99nFK53bs2T0iZsTFkRW0I6QpiXvH2GVWnXY 3jpqdAPH6OEDfsMxv8ZgUcy6S6V3/56nkqwKVIp1R6AoCk7RQ2l/uVlOxD9awmBXB0iU/h V8+H9mpUp8Y7XSvJ59lC/dJ8SWDAwRrJYgMUs/MDADx+vHYzVS6Wy60ivUh3/nuWSlnN8+ xJiXAW37LiHImXsaEtCr//qSyok2xmv3vKPnEjfgV7+/FT593vkSYFSMbjSI0g== 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=1779199730; 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=pKxNvTpZdf72F347a/u7aaUuxsRp5cmmiH8Z5RPqzfZSSF7UOUOMVDEX2A40+ztYagtzXU mjfMm8RuLe8Lprfyxtry7DDkQM2DzZ+5Uz3mj6JgQnk4O10zH7nGwFj7VVR4PimENuTBys OPBk6hvCk0PCl/Tb+2hi0x+UAKeI8sAErQHurX95A67UE0JYVXwMaWjkNDH0BUK3cD6O0o YxwRPY/hdH8W0wSA5A0MWN8iaMtbyJwFp/sgpzPWmMG43QGkjRV6Eg8fowKi5RAcIoUPSW +amZH6f6fOTlqbVNVZcHzHlmCvyIZN9AgYV8WP2IcORZz9tRoiyl3aLVAgOqqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKc3P6B5Xz2kF 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: 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/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) {