Commit 455c2ff0 authored Mar 15, 2015 by Marcel Holtmann Committed by Johan Hedberg Mar 16, 2015

Bluetooth: Fix BR/EDR out-of-band pairing with only initiator data



When only the pairing initiator is providing out-of-band data, then
the receiver side was ignoring the data. For some reason the code was
checking if the initiator has received out-of-band data and only then
also provide the required inidication that the acceptor actually has
the needed data available.

For BR/EDR out-of-band pairing it is enough if one side has received
out-of-band data. There are no extra checks needed here to make this
work smoothly. The only thing that is needed is to tell the controller
if data is present (and if it is P-192 or P-256 or both) and then let
the controller actually figure out the rest.

This means the check for outgoing connection or if the initiator has
indicated data are completely pointless and are in fact actually
causing harm. The check in question is this one:

   if (conn->out || test_bit(HCI_CONN_REMOTE_OOB, &conn->flags)) {

After just taking the conditional check out and always executing the
code for determining the type of out-of-band data, the pairing works
flawlessly and prodcudes authenticated link keys.

The patch itself looks more complicated due to the reformatting of the
indentation, but it essentially just a two-line change.

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

parent 4f0f155c

net/bluetooth/hci_event.c

+25 −29

Original line number	Diff line number	Diff line
		@@ -3889,7 +3889,6 @@ static u8 bredr_oob_data_present(struct hci_conn *conn)
		if (!data)
		return 0x00;

		if (conn->out \|\| test_bit(HCI_CONN_REMOTE_OOB, &conn->flags)) {
		if (bredr_sc_enabled(hdev)) {
		/* When Secure Connections is enabled, then just
		* return the present value stored with the OOB
		@@ -3923,9 +3922,6 @@ static u8 bredr_oob_data_present(struct hci_conn *conn)
		return 0x01;
		}

		return 0x00;
		}

		static void hci_io_capa_request_evt(struct hci_dev hdev, struct sk_buff skb)
		{
		struct hci_ev_io_capa_request ev = (void ) skb->data;

Admin message