Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D59943B9D9C; Mon, 23 Mar 2026 15:22:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774279361; cv=none; b=en9KiBG7Uxqjs0Gfa1bt2alL7wUXZa/mNVIMDLeFC0D0mFtJXLJGslZdkH3IMhVwwuBhttHS1FjDELgcTZh3OLSn+ODhE9l32Of8FJjarjhgVsYyoq0yC2MumW2x2ev7Cde5hPkvJFjh0mMHtPk28rITw1ymHBVEZXUz6CrvtEg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774279361; c=relaxed/simple; bh=VoJnHw4FM2zMF7XZxbF3ShpGzwIMgV/VBhm2GTV1StI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZbCY4VqmxdILYMyPytYNhy2xOcmGr0v08UXg4y9XRreIDSJ8L0BNyEVSUTO1n/2UuyHAYT1Gd3NWf/zqT5PJCCPmjcT5p52Oq/cQ3zdfeUEW3P4V62gzFFjtpwAoqxGbT/fnNhyAxee9BLV6dEWPp4/9zSy01NdgjY3w9XUwpMU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CUA3xuFX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CUA3xuFX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60B9DC4CEF7; Mon, 23 Mar 2026 15:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774279361; bh=VoJnHw4FM2zMF7XZxbF3ShpGzwIMgV/VBhm2GTV1StI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUA3xuFXpFK726D6grVOrl79XMAZtPmsXFWCT4Z0rsC55CLiTYhCx1ZnrpYjoYzqh S/uwU26zNxI9eYsN43LLpVLaTNLFVu2ELk40UXm9ZkE0ZJkTi6Z4yU8H024S6WrjHs xYL7fH9A8kzOK+8AHPl3UWgRnK/TXwet8wdEqmfc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yiming Qian , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.6 552/567] Bluetooth: L2CAP: Fix accepting multiple L2CAP_ECRED_CONN_REQ Date: Mon, 23 Mar 2026 14:47:52 +0100 Message-ID: <20260323134547.661536489@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134533.749096647@linuxfoundation.org> References: <20260323134533.749096647@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luiz Augusto von Dentz commit 5b3e2052334f2ff6d5200e952f4aa66994d09899 upstream. Currently the code attempts to accept requests regardless of the command identifier which may cause multiple requests to be marked as pending (FLAG_DEFER_SETUP) which can cause more than L2CAP_ECRED_MAX_CID(5) to be allocated in l2cap_ecred_rsp_defer causing an overflow. The spec is quite clear that the same identifier shall not be used on subsequent requests: 'Within each signaling channel a different Identifier shall be used for each successive request or indication.' https://www.bluetooth.com/wp-content/uploads/Files/Specification/HTML/Core-62/out/en/host/logical-link-control-and-adaptation-protocol-specification.html#UUID-32a25a06-4aa4-c6c7-77c5-dcfe3682355d So this attempts to check if there are any channels pending with the same identifier and rejects if any are found. Fixes: 15f02b910562 ("Bluetooth: L2CAP: Add initial code for Enhanced Credit Based Mode") Reported-by: Yiming Qian Signed-off-by: Luiz Augusto von Dentz [ adapted variable names ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/l2cap_core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -5007,7 +5007,7 @@ static inline int l2cap_ecred_conn_req(s u16 mtu, mps; __le16 psm; u8 result, len = 0; - int i, num_scid; + int i, num_scid = 0; bool defer = false; if (!enable_ecred) @@ -5017,6 +5017,14 @@ static inline int l2cap_ecred_conn_req(s result = L2CAP_CR_LE_INVALID_PARAMS; goto response; } + + /* Check if there are no pending channels with the same ident */ + __l2cap_chan_list_id(conn, cmd->ident, l2cap_ecred_list_defer, + &num_scid); + if (num_scid) { + result = L2CAP_CR_LE_INVALID_PARAMS; + goto response; + } cmd_len -= sizeof(*req); num_scid = cmd_len / sizeof(u16);