Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69c4e4e8 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix responding to invalid L2CAP signaling commands 



When we have an LE link we should not respond to any data on the BR/EDR
L2CAP signaling channel (0x0001) and vice-versa when we have a BR/EDR
link we should not respond to LE L2CAP (CID 0x0005) signaling commands.
This patch fixes this issue by checking for a valid link type and
ignores data if it is wrong.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 9245e737

net/bluetooth/l2cap_core.c

+8 −0
Original line number Diff line number Diff line
@@ -5311,6 +5311,7 @@ static __le16 l2cap_err_to_reason(int err) 
static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,

					struct sk_buff *skb)

{

	struct hci_conn *hcon = conn->hcon;

	u8 *data = skb->data;

	int len = skb->len;

	struct l2cap_cmd_hdr cmd;
@@ -5318,6 +5319,9 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn, 


	l2cap_raw_recv(conn, skb);



	if (hcon->type != LE_LINK)

		return;



	while (len >= L2CAP_CMD_HDR_SIZE) {

		u16 cmd_len;

		memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);
@@ -5355,6 +5359,7 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn, 
static inline void l2cap_sig_channel(struct l2cap_conn *conn,

				     struct sk_buff *skb)

{

	struct hci_conn *hcon = conn->hcon;

	u8 *data = skb->data;

	int len = skb->len;

	struct l2cap_cmd_hdr cmd;
@@ -5362,6 +5367,9 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, 


	l2cap_raw_recv(conn, skb);



	if (hcon->type != ACL_LINK)

		return;



	while (len >= L2CAP_CMD_HDR_SIZE) {

		u16 cmd_len;

		memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);