From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A14A3A3E78; Tue, 16 Jun 2026 17:26:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630793; cv=none; b=OZVEe/FwK2MN/y4TRS7cJXdg3XFDntV+Uma1YHepy+CjId6xxX1c/OoaDxnn7O2CPnF6RAfCIrH6+qDD/IylrUooMO7/S7vglu+mmicnuwQJUfAdluKXvx8qmyRzh3i6ASd5xkVnax6ME8AZuEjvustVEbQqkzWxD6CmtukwQ48= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630793; c=relaxed/simple; bh=2//BMCVdIMp9nzln9chggylI/P3IA71gdcf2GZ0p5L4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H4qkoSYs3Y5pDvhXxkedb4S0IGOZSrtknfwzbBcL+xX64y055zVekVV3mRHPOG6kMnFkjln1YnlZMGpE2c13F06miu3cXPOGrOxortY/minoMThnZaBZvjnPU35u01R8ZMv4aQ7BIleJKhfv5v9m3G8jvTD/B4wuttBweqrPcp4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dmco+/FU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dmco+/FU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A39C1F000E9; Tue, 16 Jun 2026 17:26:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630792; bh=oHRdDkTe0b2n8ZAKRRflrTmyDeLkjYqe146BK07FZKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dmco+/FUdOsAB4R2dQ+6XR9VqbktY6oLdMx8Kef+7KrMuYdLMXlyj2pnxPnpw3Tsf mDumD1iONe5uS6npULofmByhadaiSeF1VBT47SzEcwhjuzh+iv5PnTW6xV+gFQ4+oi R54OkuZLFkm7cfiZhUImR3hSs1a04xtpu19RFdlU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Siwei Zhang , Luiz Augusto von Dentz Subject: [PATCH 6.1 096/522] Bluetooth: L2CAP: fix chan ref leak in l2cap_chan_timeout() on !conn Date: Tue, 16 Jun 2026 20:24:03 +0530 Message-ID: <20260616145130.389085608@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Siwei Zhang commit 9dbd84990394c51f5cee1e8871bb5ff8af5ed939 upstream. __set_chan_timer() takes a l2cap_chan reference via l2cap_chan_hold() before scheduling the delayed work. The normal path in l2cap_chan_timeout() drops this reference with l2cap_chan_put() at the end, but the early return when chan->conn is NULL skips the put, leaking the reference. Add the missing l2cap_chan_put() before the early return. Fixes: adf0398cee86 ("Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout") Cc: stable@vger.kernel.org Signed-off-by: Siwei Zhang Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/l2cap_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -435,8 +435,10 @@ static void l2cap_chan_timeout(struct wo BT_DBG("chan %p state %s", chan, state_to_string(chan->state)); - if (!conn) + if (!conn) { + l2cap_chan_put(chan); return; + } mutex_lock(&conn->chan_lock); /* __set_chan_timer() calls l2cap_chan_hold(chan) while scheduling