UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: L2CAP: Fix possible multiple reject send 

[ Upstream commit 96a3398b467ab8aada3df2f3a79f4b7835d068b8 ]

In case of an incomplete command or a command with a null identifier 2
reject packets will be sent, one with the identifier and one with 0.
Consuming the data of the command will prevent it.
This allows to send a reject packet for each corrupted command in a
multi-command packet.

Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Frédéric Danis 2023-12-19 09:10:22 +01:00 committed by Greg Kroah-Hartman
parent e266b7b2d4
commit 100089a1ec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/bluetooth/l2cap_core.c
View File

@ -6526,7 +6526,8 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,
if (len > skb->len || !cmd->ident) { if (len > skb->len || !cmd->ident) {
BT_DBG("corrupted command"); BT_DBG("corrupted command");
l2cap_sig_send_rej(conn, cmd->ident); l2cap_sig_send_rej(conn, cmd->ident);
break; skb_pull(skb, len > skb->len ? skb->len : len);
continue;
} }
err = l2cap_bredr_sig_cmd(conn, cmd, len, skb->data); err = l2cap_bredr_sig_cmd(conn, cmd, len, skb->data);