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 AA92020ED for ; Thu, 16 Jul 2026 00:04:15 +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=1784160256; cv=none; b=QeLWTAUHQyZBwb8KQUJCydD6JmqapcqfbY7mAKXmVeD5Um77C9xX7jmBOIVrsSIMqAyvgMXgqAvHKVYjQZsJSmZ91gdk1v3aKO+fnNvVh2ymzzfSVvL8TUOC5xdOaE9M+HxuHJXHyuN9tus4FvKXQEDH3OeBteT/izuRbMQpqo0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784160256; c=relaxed/simple; bh=TX3+TU8GY0JlVHgSoJP7tQ7dmo4w+AXnn8N4ZiDIKPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TEPJMd6Mx4+4dGKwLDFMnN6UrvWdkVncOlXpbxb9oJeT/nRpshLsML1pY0ZsJXu9ccy8OMTteNMLznAB+mezz5J3MDGbNb+aUCvM1kXqlxtqx6aOAL+VSZNUeWQsUmoFBqD7LzvL1TjEEzIxEciIOUHRQgDHNZEzaBKXtro6IT0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XFGUzamB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XFGUzamB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF39B1F000E9; Thu, 16 Jul 2026 00:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784160255; bh=Sy7whdbvp6LYIYvR31UFDtrekszNuKaSixJyUppGYIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XFGUzamBJ54bXjvScXzWZkn7uNbmI1cm5uIEfcaAY62Khp+XULG9i7vuBP/xn5zAt PVMYIn8H8bJJ0NkEMAOqcVZ9yfSX6KD4Mc5sbPR7KE8CCpTfvqJ2Qau8mb6pZftmpV Q90uUqdhtq4LAwxA6IjL55z49vcrkLsWxWaK0T7oD9wUhC2LWvxjr2zBeSU7WmAVRM ztkVcLAfaDZ1gOY9/P2Ku9DZ3RuWBl7487LMeF38gYPBQZs/pqpdDfaTTb0/JJTHFX kbM7RwU307hGFwIgt2WPkkhhpP4zQzWDRLKsMRU5PE22HPMAk0L0NhFnpz8qVv56gE ahevf4JLKGX2Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Luiz Augusto von Dentz , Paul Menzel , Sasha Levin Subject: [PATCH 5.15.y 1/3] Bluetooth: L2CAP: Fix not tracking outstanding TX ident Date: Wed, 15 Jul 2026 20:04:11 -0400 Message-ID: <20260716000413.561625-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026071336-evolve-imaging-b852@gregkh> References: <2026071336-evolve-imaging-b852@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 6c3ea155e5ee3e56606233acde8309afda66d483 ] This attempts to proper track outstanding request by using struct ida and allocating from it in l2cap_get_ident using ida_alloc_range which would reuse ids as they are free, then upon completion release the id using ida_free. This fixes the qualification test case L2CAP/COS/CED/BI-29-C which attempts to check if the host stack is able to work after 256 attempts to connect which requires Ident field to use the full range of possible values in order to pass the test. Link: https://github.com/bluez/bluez/issues/1829 Signed-off-by: Luiz Augusto von Dentz Reviewed-by: Paul Menzel Stable-dep-of: 2641a9e0a1dd ("Bluetooth: L2CAP: cancel pending_rx_work before taking conn->lock") Signed-off-by: Sasha Levin --- include/net/bluetooth/l2cap.h | 3 +- net/bluetooth/l2cap_core.c | 53 ++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 6e48bd56f4c3b7..b023b0dba440be 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -691,8 +691,7 @@ struct l2cap_conn { struct sk_buff *rx_skb; __u32 rx_len; - __u8 tx_ident; - struct mutex ident_lock; + struct ida tx_ida; struct sk_buff_head pending_rx; struct work_struct pending_rx_work; diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index ed2388e31c6c7f..b3eb416eaebd18 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -937,26 +937,18 @@ int l2cap_chan_check_security(struct l2cap_chan *chan, bool initiator) initiator); } -static u8 l2cap_get_ident(struct l2cap_conn *conn) +static int l2cap_get_ident(struct l2cap_conn *conn) { - u8 id; + /* LE link does not support tools like l2ping so use the full range */ + if (conn->hcon->type == LE_LINK) + return ida_alloc_range(&conn->tx_ida, 1, 255, GFP_ATOMIC); /* Get next available identificator. * 1 - 128 are used by kernel. * 129 - 199 are reserved. * 200 - 254 are used by utilities like l2ping, etc. */ - - mutex_lock(&conn->ident_lock); - - if (++conn->tx_ident > 128) - conn->tx_ident = 1; - - id = conn->tx_ident; - - mutex_unlock(&conn->ident_lock); - - return id; + return ida_alloc_range(&conn->tx_ida, 1, 128, GFP_ATOMIC); } static void l2cap_send_cmd(struct l2cap_conn *conn, u8 ident, u8 code, u16 len, @@ -1915,6 +1907,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) if (work_pending(&conn->pending_rx_work)) cancel_work_sync(&conn->pending_rx_work); + ida_destroy(&conn->tx_ida); + if (work_pending(&conn->id_addr_update_work)) cancel_work_sync(&conn->id_addr_update_work); @@ -5758,12 +5752,41 @@ static int l2cap_le_connect_rsp(struct l2cap_conn *conn, return err; } +static void l2cap_put_ident(struct l2cap_conn *conn, u8 code, u8 id) +{ + int ret; + + switch (code) { + case L2CAP_COMMAND_REJ: + case L2CAP_CONN_RSP: + case L2CAP_CONF_RSP: + case L2CAP_DISCONN_RSP: + case L2CAP_ECHO_RSP: + case L2CAP_INFO_RSP: + case L2CAP_CONN_PARAM_UPDATE_RSP: + case L2CAP_ECRED_CONN_RSP: + case L2CAP_ECRED_RECONF_RSP: + /* The remote may send bogus ids that would make ida_free + * generate warnings, so only free ids that are actually + * allocated: probing the exact id returns -ENOSPC when it + * is in use, otherwise the probe allocated it and freeing + * is safe either way. Only on -ENOMEM is the id known to + * be unallocated and the free must be skipped. + */ + ret = ida_alloc_range(&conn->tx_ida, id, id, GFP_ATOMIC); + if (ret >= 0 || ret == -ENOSPC) + ida_free(&conn->tx_ida, id); + } +} + static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data) { int err = 0; + l2cap_put_ident(conn, cmd->code, cmd->ident); + switch (cmd->code) { case L2CAP_COMMAND_REJ: l2cap_command_rej(conn, cmd, cmd_len, data); @@ -6502,6 +6525,8 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, { int err = 0; + l2cap_put_ident(conn, cmd->code, cmd->ident); + switch (cmd->code) { case L2CAP_COMMAND_REJ: l2cap_le_command_rej(conn, cmd, cmd_len, data); @@ -8055,13 +8080,13 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon) hci_dev_test_flag(hcon->hdev, HCI_FORCE_BREDR_SMP))) conn->local_fixed_chan |= L2CAP_FC_SMP_BREDR; - mutex_init(&conn->ident_lock); mutex_init(&conn->chan_lock); INIT_LIST_HEAD(&conn->chan_l); INIT_LIST_HEAD(&conn->users); INIT_DELAYED_WORK(&conn->info_timer, l2cap_info_timeout); + ida_init(&conn->tx_ida); skb_queue_head_init(&conn->pending_rx); INIT_WORK(&conn->pending_rx_work, process_pending_rx); -- 2.53.0