From mboxrd@z Thu Jan 1 00:00:00 1970 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 9603A375AA9 for ; Sun, 22 Mar 2026 01:27: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=1774142861; cv=none; b=lQsM5UmKUrVQIDwDvWIcwqEyOO5Mm/jxXJd6sSIi+j1CZZfdo4sJrfJYtW6zq31v09vpQuJRC1IXluhR0MP/qD1dfEo29nalr5EHhLQ7DsxVojfvoCBwIxEOGSfPHM/WIem339r5l3JYE/GhBbN66uviWIh3Dkk3f/r/QXZhvpQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774142861; c=relaxed/simple; bh=oS2MML9CIH3w+3GAHGlCi36bnzdCQBHRbPyK9p8TinM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iUfWpJYh9Bv1tAAesP2nU18d98o5J2QRq7jkwCtbzQ7lFKKZXQ+gA5Z3/QCN2C5Oovi0t3OyYfgLESLzeZ4yiek/qqJyVEthjJPssvmoQ2W6R+hxEz3A2Y78OaZRmPrPbmfSFh/6KBa574PaZQEVL1pF6WdB1SRLXNHXC5YP2M0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sPmy/hQK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sPmy/hQK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06256C2BCB0; Sun, 22 Mar 2026 01:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774142861; bh=oS2MML9CIH3w+3GAHGlCi36bnzdCQBHRbPyK9p8TinM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPmy/hQKtsIFJVeUZdgfuQtm5vOisCqi2Aerr9/HBfVR23vV9DQ9Kvv6iTpIsHWJl RfDcm2VPPTr+SuYe011XwKjUysR/QKhQPCPQ0nkj4v5YvWEiK5c+eVPPmgL+tbyiA6 CVaYVDamD1WPQgBnjs6EAzUjswqBgaU6V3jukbqamt6gkDGRzgdGfZUvDzSs7waJSK ul3ntRVWoUVQ9bnJ8yIf5EDTLn+S8BxxqeHyZV+WGjH4EOxwxRcZf8Yz9NjNmoLsK6 EdIolvTDlDKZZU6L51rrjPuKhrVlx4HDdQuWf9gfhS6INipOshTFr4PxJ/sov5nbIK FTY5mMgEVAsHQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Luiz Augusto von Dentz , Yiming Qian , Sasha Levin Subject: [PATCH 5.15.y] Bluetooth: L2CAP: Fix accepting multiple L2CAP_ECRED_CONN_REQ Date: Sat, 21 Mar 2026 21:27:39 -0400 Message-ID: <20260322012739.673067-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026032112-attain-reprocess-ab80@gregkh> References: <2026032112-attain-reprocess-ab80@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Luiz Augusto von Dentz [ Upstream commit 5b3e2052334f2ff6d5200e952f4aa66994d09899 ] 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 --- net/bluetooth/l2cap_core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 88f8c98afd5f5..d9ac64bc5407e 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6036,7 +6036,7 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn, u16 mtu, mps; __le16 psm; u8 result, len = 0; - int i, num_scid; + int i, num_scid = 0; bool defer = false; if (!enable_ecred) @@ -6047,6 +6047,14 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn, 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); -- 2.51.0