Commit 9eb1fbfa authored Apr 11, 2014 by Johan Hedberg

Bluetooth: Fix triggering BR/EDR L2CAP Connect too early



Commit 1c2e0041 introduced an event handler for the encryption key
refresh complete event with the intent of fixing some LE/SMP cases.
However, this event is shared with BR/EDR and there we actually want to
act only on the auth_complete event (which comes after the key refresh).

If we do not do this we may trigger an L2CAP Connect Request too early
and cause the remote side to return a security block error.

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

parent 3c49aa85

net/bluetooth/hci_event.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -3330,6 +3330,12 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
		if (!conn)
		goto unlock;

		/* For BR/EDR the necessary steps are taken through the
		* auth_complete event.
		*/
		if (conn->type != LE_LINK)
		goto unlock;

		if (!ev->status)
		conn->sec_level = conn->pending_sec_level;