Linux-Bluetooth Archive on lore.kernel.org
 help / color / Atom feed
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v5 11/11] Bluetooth: btsdio: Check for valid packet type
Date: Wed, 15 Jan 2020 13:02:21 -0800
Message-ID: <20200115210221.13096-12-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20200115210221.13096-1-luiz.dentz@gmail.com>

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Check for valid packet type before calling hci_recv_frame which is
inline with what other drivers are doing.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 drivers/bluetooth/btsdio.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index fd9571d5fdac..199e8f7d426d 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -145,11 +145,20 @@ static int btsdio_rx_packet(struct btsdio_data *data)
 
 	data->hdev->stat.byte_rx += len;
 
-	hci_skb_pkt_type(skb) = hdr[3];
-
-	err = hci_recv_frame(data->hdev, skb);
-	if (err < 0)
-		return err;
+	switch (hdr[3]) {
+	case HCI_EVENT_PKT:
+	case HCI_ACLDATA_PKT:
+	case HCI_SCODATA_PKT:
+	case HCI_ISODATA_PKT:
+		hci_skb_pkt_type(skb) = hdr[3];
+		err = hci_recv_frame(data->hdev, skb);
+		if (err < 0)
+			return err;
+		break;
+	default:
+		kfree_skb(skb);
+		return -EINVAL;
+	}
 
 	sdio_writeb(data->func, 0x00, REG_PC_RRT, NULL);
 
-- 
2.21.0


  parent reply index

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-15 21:02 [PATCH v5 00/11] Bluetooth 5.2 initial support Luiz Augusto von Dentz
2020-01-15 21:02 ` [PATCH v5 01/11] Bluetooth: Add definitions for CIS connections Luiz Augusto von Dentz
2020-01-15 21:25   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 02/11] Bluetooth: Add initial implementation of " Luiz Augusto von Dentz
2020-01-15 21:18   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 03/11] Bluetooth: L2CAP: Add definitions for Enhanced Credit Based Mode Luiz Augusto von Dentz
2020-01-15 21:20   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 04/11] Bluetooth: L2CAP: Add initial code " Luiz Augusto von Dentz
2020-01-15 21:02 ` [PATCH v5 05/11] Bluetooth: L2CAP: Rename FLAG_LE_CONN_REQ_SENT to FLAG_LE_FLOWCTL_CONN_REQ_SENT Luiz Augusto von Dentz
2020-01-15 21:26   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 06/11] Bluetooth: hci_vhci: Add support for ISO packets Luiz Augusto von Dentz
2020-01-15 21:25   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 07/11] Bluetooth: monitor: " Luiz Augusto von Dentz
2020-01-15 21:25   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 08/11] Bluetooth: Make use of __check_timeout on hci_sched_le Luiz Augusto von Dentz
2020-01-15 21:25   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 09/11] Bluetooth: hci_h4: Add support for ISO packets Luiz Augusto von Dentz
2020-01-15 21:25   ` Marcel Holtmann
2020-01-15 21:02 ` [PATCH v5 10/11] Bluetooth: hci_h5: " Luiz Augusto von Dentz
2020-01-15 21:25   ` Marcel Holtmann
2020-01-15 21:02 ` Luiz Augusto von Dentz [this message]
2020-01-15 21:25   ` [PATCH v5 11/11] Bluetooth: btsdio: Check for valid packet type Marcel Holtmann

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200115210221.13096-12-luiz.dentz@gmail.com \
    --to=luiz.dentz@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Bluetooth Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-bluetooth/0 linux-bluetooth/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-bluetooth linux-bluetooth/ https://lore.kernel.org/linux-bluetooth \
		linux-bluetooth@vger.kernel.org
	public-inbox-index linux-bluetooth

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-bluetooth


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git