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

Commit b7e04735 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

parents 73f0b56a 1bc5ad16

drivers/bluetooth/ath3k.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0930, 0x0220) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x0489, 0xe057) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x13d3, 0x3393) },

	{ USB_DEVICE(0x0489, 0xe04e) },

	{ USB_DEVICE(0x0489, 0xe04e) },
@@ -129,6 +130,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -154,6 +154,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

net/bluetooth/hci_sock.c

+16 −10
Original line number Original line Diff line number Diff line
@@ -940,8 +940,22 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
	bt_cb(skb)->pkt_type = *((unsigned char *) skb->data);

	bt_cb(skb)->pkt_type = *((unsigned char *) skb->data);

	skb_pull(skb, 1);

	skb_pull(skb, 1);





	if (hci_pi(sk)->channel == HCI_CHANNEL_RAW &&

	if (hci_pi(sk)->channel == HCI_CHANNEL_USER) {

	    bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {

		/* No permission check is needed for user channel

		 * since that gets enforced when binding the socket.

		 *

		 * However check that the packet type is valid.

		 */

		if (bt_cb(skb)->pkt_type != HCI_COMMAND_PKT &&

		    bt_cb(skb)->pkt_type != HCI_ACLDATA_PKT &&

		    bt_cb(skb)->pkt_type != HCI_SCODATA_PKT) {

			err = -EINVAL;

			goto drop;

		}



		skb_queue_tail(&hdev->raw_q, skb);

		queue_work(hdev->workqueue, &hdev->tx_work);

	} else if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {

		u16 opcode = get_unaligned_le16(skb->data);

		u16 opcode = get_unaligned_le16(skb->data);

		u16 ogf = hci_opcode_ogf(opcode);

		u16 ogf = hci_opcode_ogf(opcode);

		u16 ocf = hci_opcode_ocf(opcode);

		u16 ocf = hci_opcode_ocf(opcode);
@@ -972,14 +986,6 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
			goto drop;

			goto drop;

		}

		}





		if (hci_pi(sk)->channel == HCI_CHANNEL_USER &&

		    bt_cb(skb)->pkt_type != HCI_COMMAND_PKT &&

		    bt_cb(skb)->pkt_type != HCI_ACLDATA_PKT &&

		    bt_cb(skb)->pkt_type != HCI_SCODATA_PKT) {

			err = -EINVAL;

			goto drop;

		}



		skb_queue_tail(&hdev->raw_q, skb);

		skb_queue_tail(&hdev->raw_q, skb);

		queue_work(hdev->workqueue, &hdev->tx_work);

		queue_work(hdev->workqueue, &hdev->tx_work);

	}

	}