kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: Mark controller is down when HCI_AUTO_OFF is set

Browse source 
During the initial setup phase, the controller is powered on and will
be powered off again if it is not used within the auto-off timeout.

Userspace using ioctl does not know about the difference between the
initial setup phase and a controller being present. It is a bad idea
to keep the controller powered by just looking at the device list or
device information. Instead just tell userspace that the controller
is still down.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-07-10 13:17:37 +02:00 committed by Johan Hedberg
parent 13a779e422
commit 2e84d8db91
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
net/bluetooth/hci_core.c
View file

@ -2817,14 +2817,20 @@ int hci_get_dev_list(void __user *arg)
read_lock(&hci_dev_list_lock); read_lock(&hci_dev_list_lock);
list_for_each_entry(hdev, &hci_dev_list, list) { list_for_each_entry(hdev, &hci_dev_list, list) {
if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags)) unsigned long flags = hdev->flags;
cancel_delayed_work(&hdev->power_off);
/* When the auto-off is configured it means the transport
* is running, but in that case still indicate that the
* device is actually down.
*/
if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
flags &= ~BIT(HCI_UP);
if (!test_bit(HCI_MGMT, &hdev->dev_flags)) if (!test_bit(HCI_MGMT, &hdev->dev_flags))
set_bit(HCI_PAIRABLE, &hdev->dev_flags); set_bit(HCI_PAIRABLE, &hdev->dev_flags);
(dr + n)->dev_id = hdev->id; (dr + n)->dev_id = hdev->id;
(dr + n)->dev_opt = hdev->flags; (dr + n)->dev_opt = flags;
if (++n >= dev_num) if (++n >= dev_num)
break; break;
@ -2844,6 +2850,7 @@ int hci_get_dev_info(void __user *arg)
{ {
struct hci_dev *hdev; struct hci_dev *hdev;
struct hci_dev_info di; struct hci_dev_info di;
unsigned long flags;
int err = 0; int err = 0;
if (copy_from_user(&di, arg, sizeof(di))) if (copy_from_user(&di, arg, sizeof(di)))
@ -2853,8 +2860,14 @@ int hci_get_dev_info(void __user *arg)
if (!hdev) if (!hdev)
return -ENODEV; return -ENODEV;
if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->dev_flags)) /* When the auto-off is configured it means the transport
cancel_delayed_work_sync(&hdev->power_off); * is running, but in that case still indicate that the
* device is actually down.
*/
if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
flags = hdev->flags & ~BIT(HCI_UP);
else
flags = hdev->flags;
if (!test_bit(HCI_MGMT, &hdev->dev_flags)) if (!test_bit(HCI_MGMT, &hdev->dev_flags))
set_bit(HCI_PAIRABLE, &hdev->dev_flags); set_bit(HCI_PAIRABLE, &hdev->dev_flags);
@ -2862,7 +2875,7 @@ int hci_get_dev_info(void __user *arg)
strcpy(di.name, hdev->name); strcpy(di.name, hdev->name);
di.bdaddr = hdev->bdaddr; di.bdaddr = hdev->bdaddr;
di.type = (hdev->bus & 0x0f) | ((hdev->dev_type & 0x03) << 4); di.type = (hdev->bus & 0x0f) | ((hdev->dev_type & 0x03) << 4);
di.flags = hdev->flags; di.flags = flags;
di.pkt_type = hdev->pkt_type; di.pkt_type = hdev->pkt_type;
if (lmp_bredr_capable(hdev)) { if (lmp_bredr_capable(hdev)) {
di.acl_mtu = hdev->acl_mtu; di.acl_mtu = hdev->acl_mtu;