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

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

Bluetooth: Make hci_send_to_sock usable for management control sockets 



In order to send data to management control sockets the function should:

  - skip checks intended for raw HCI data and stack internal events
  - make sure RAW HCI data or stack internal events don't go to
    management control sockets

In order to accomplish this the patch adds a new member to the bluetooth
skb private data to flag skb's that are destined for management control
sockets.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 0381101f

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ struct bt_skb_cb { 
	__u8 tx_seq;

	__u8 retries;

	__u8 sar;

	unsigned short channel;

};

#define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))

net/bluetooth/hci_sock.c

+9 −1
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) 
		if (skb->sk == sk)

			continue;



		if (bt_cb(skb)->channel != hci_pi(sk)->channel)

			continue;



		if (bt_cb(skb)->channel == HCI_CHANNEL_CONTROL)

			goto clone;



		/* Apply filter */

		flt = &hci_pi(sk)->filter;
@@ -127,11 +133,13 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) 
				continue;

		}



clone:

		nskb = skb_clone(skb, GFP_ATOMIC);

		if (!nskb)

			continue;



		/* Put type byte before the data */

		if (bt_cb(skb)->channel == HCI_CHANNEL_RAW)

			memcpy(skb_push(nskb, 1), &bt_cb(nskb)->pkt_type, 1);



		if (sock_queue_rcv_skb(sk, nskb))