Bluetooth: Restrict access for raw-only controllers

Bluetooth controllers that are marked for raw-only usage can only be
used with user channel access. Any other operation should be rejected.

This simplifies the whole raw-only support since it now depends on
the fact that the controller is marked with HCI_QUIRK_RAW_DEVICE and
runtime raw access is restricted to user channel operation.

The kernel internal processing of HCI commands and events is designed
around the case that either the kernel has full control over the device
or that the device is driven from userspace. This now makes a clear
distinction between these two possible operation modes.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6faa4616cbfe..41b1aec0c5dc 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -347,6 +347,9 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data,
                 if (test_bit(HCI_USER_CHANNEL, &d->dev_flags))
                         continue;
 
+                if (test_bit(HCI_QUIRK_RAW_DEVICE, &d->quirks))
+                        continue;
+
                 if (d->dev_type == HCI_BREDR) {
                         rp->index[count++] = cpu_to_le16(d->id);
                         BT_DBG("Added hci%u", d->id);
@@ -5066,7 +5069,8 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
                 }
 
                 if (test_bit(HCI_SETUP, &hdev->dev_flags) ||
-                    test_bit(HCI_USER_CHANNEL, &hdev->dev_flags)) {
+                    test_bit(HCI_USER_CHANNEL, &hdev->dev_flags) ||
+                    test_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks)) {
                         err = cmd_status(sk, index, opcode,
                                          MGMT_STATUS_INVALID_INDEX);
                         goto done;