iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: timeout handling in new connect procedure

Browse Source 
Currently, when trying to connect to already paired device that just
rotated its RPA MAC address, old address would be used and connection
would fail. In order to fix that, kernel must scan and receive
advertisement with fresh RPA before connecting.

This patch makes sure that when new procedure is in use, and we're stuck
in scan phase because no advertisement was received and timeout happened,
or app decided to close socket, scan whitelist gets properly cleaned up.

Signed-off-by: Jakub Pawlowski <jpawlowski@google.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Jakub Pawlowski 2015-08-07 20:22:55 +02:00 committed by Marcel Holtmann
parent 28a667c9c2
commit cc2b6911a2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/hci_conn.c
View File

@ -382,8 +382,12 @@ static void hci_conn_timeout(struct work_struct *work)
if (conn->out) { if (conn->out) {
if (conn->type == ACL_LINK) if (conn->type == ACL_LINK)
hci_acl_create_connection_cancel(conn); hci_acl_create_connection_cancel(conn);
else if (conn->type == LE_LINK) else if (conn->type == LE_LINK) {
hci_le_create_connection_cancel(conn); if (test_bit(HCI_CONN_SCANNING, &conn->flags))
hci_connect_le_scan_remove(conn);
else
hci_le_create_connection_cancel(conn);
}
} else if (conn->type == SCO_LINK || conn->type == ESCO_LINK) { } else if (conn->type == SCO_LINK || conn->type == ESCO_LINK) {
hci_reject_sco(conn); hci_reject_sco(conn);
} }