diff options
| author | Frédéric Danis <frederic.danis@collabora.com> | 2023-12-19 11:10:22 +0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2023-12-22 20:59:46 +0300 |
| commit | 96a3398b467ab8aada3df2f3a79f4b7835d068b8 (patch) | |
| tree | 185b5c756b0aae383ffa8b86cfd9c0423fdbea77 /net/bluetooth | |
| parent | d4b70ba1eab450eff9c5ef536f07c01d424b7eda (diff) | |
| download | linux-96a3398b467ab8aada3df2f3a79f4b7835d068b8.tar.xz | |
Bluetooth: L2CAP: Fix possible multiple reject send
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>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index baeebee41cd9..60298975d5c4 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6526,7 +6526,8 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, if (len > skb->len || !cmd->ident) { BT_DBG("corrupted command"); 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); |