Commit 6a8fc95c authored Dec 24, 2014 by Johan Hedberg Committed by Marcel Holtmann Dec 24, 2014

Bluetooth: Fix accepting connections when not using mgmt



When connectable mode is enabled (page scan on) through some non-mgmt
method the HCI_CONNECTABLE flag will not be set. For backwards
compatibility with user space versions not using mgmt we should not
require HCI_CONNECTABLE to be set if HCI_MGMT is not set.

Reported-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org # 3.17+

parent 8bfe8442

net/bluetooth/hci_event.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2197,7 +2197,12 @@ static void hci_conn_request_evt(struct hci_dev hdev, struct sk_buff skb)
		return;
		}

		if (!test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
		/* Require HCI_CONNECTABLE or a whitelist entry to accept the
		* connection. These features are only touched through mgmt so
		* only do the checks if HCI_MGMT is set.
		*/
		if (test_bit(HCI_MGMT, &hdev->dev_flags) &&
		!test_bit(HCI_CONNECTABLE, &hdev->dev_flags) &&
		!hci_bdaddr_list_lookup(&hdev->whitelist, &ev->bdaddr,
		BDADDR_BREDR)) {
		hci_reject_conn(hdev, &ev->bdaddr);