Commit cc974003 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Add missing checks for HCI_ISODATA_PKT packet type 



The checks for HCI_ISODATA_PKT packet type are required in a few
additional locations to allow sending/receiving of this new packet type.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 268d3636

net/bluetooth/hci_core.c

+3 −1
Original line number Diff line number Diff line
@@ -3565,7 +3565,8 @@ int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	if (hci_skb_pkt_type(skb) != HCI_EVENT_PKT &&

	    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &&

	    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT) {

	    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &&

	    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT) {

		kfree_skb(skb);

		return -EINVAL;

	}
@@ -4543,6 +4544,7 @@ static void hci_rx_work(struct work_struct *work) 
			switch (hci_skb_pkt_type(skb)) {

			case HCI_ACLDATA_PKT:

			case HCI_SCODATA_PKT:

			case HCI_ISODATA_PKT:

				kfree_skb(skb);

				continue;

			}

net/bluetooth/hci_sock.c

+8 −4
Original line number Diff line number Diff line
@@ -211,7 +211,8 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) 
			if (hci_skb_pkt_type(skb) != HCI_COMMAND_PKT &&

			    hci_skb_pkt_type(skb) != HCI_EVENT_PKT &&

			    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &&

			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT)

			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &&

			    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT)

				continue;

			if (is_filtered_packet(sk, skb))

				continue;
@@ -220,7 +221,8 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) 
				continue;

			if (hci_skb_pkt_type(skb) != HCI_EVENT_PKT &&

			    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &&

			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT)

			    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &&

			    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT)

				continue;

		} else {

			/* Don't send frame to other channel types */
@@ -1768,7 +1770,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg, 
		 */

		if (hci_skb_pkt_type(skb) != HCI_COMMAND_PKT &&

		    hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &&

		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT) {

		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &&

		    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT) {

			err = -EINVAL;

			goto drop;

		}
@@ -1812,7 +1815,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg, 
		}



		if (hci_skb_pkt_type(skb) != HCI_ACLDATA_PKT &&

		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT) {

		    hci_skb_pkt_type(skb) != HCI_SCODATA_PKT &&

		    hci_skb_pkt_type(skb) != HCI_ISODATA_PKT) {

			err = -EINVAL;

			goto drop;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE