diff options
| author | Dean Jenkins <Dean_Jenkins@mentor.com> | 2017-04-28 14:57:24 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2017-04-30 12:22:14 +0200 |
| commit | ab00f89fdff61975fa52a61608080ea7b8d8e800 (patch) | |
| tree | a80aef68616f4b4ec6f19f2ec9eabe503a2747f7 | |
| parent | Bluetooth: Add module license for HCI UART Nokia H4+ (diff) | |
| download | linux-ab00f89fdff61975fa52a61608080ea7b8d8e800.tar.xz linux-ab00f89fdff61975fa52a61608080ea7b8d8e800.zip | |
Bluetooth: hci_ldisc: Add protocol check to hci_uart_send_frame()
Before attempting to send a HCI message, check that the Data Link
protocol is still bound to the HCI UART driver. This makes the code
consistent with the usage of the other proto function pointers.
Therefore, add a check for HCI_UART_PROTO_READY into hci_uart_send_frame()
and return -EUNATCH if the Data Link protocol is not bound.
This also allows hci_send_frame() to report the error of an unbound
Data Link protocol layer. Therefore, it assists with diagnostics into
why HCI messages are being sent when the Data Link protocol is not
bound and avoids potential crashes.
Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index c53513cb7654..c515aa9b923c 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -256,6 +256,9 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb) BT_DBG("%s: type %d len %d", hdev->name, hci_skb_pkt_type(skb), skb->len); + if (!test_bit(HCI_UART_PROTO_READY, &hu->flags)) + return -EUNATCH; + hu->proto->enqueue(hu, skb); hci_uart_tx_wakeup(hu); |