diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-10-29 00:23:26 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-16 17:59:47 +0300 |
| commit | f3d02a6c4f7d683e301d600e0736c09fcb8fa899 (patch) | |
| tree | 98db30d9de4b566a481ae59da7b476fac8e53cf5 /net/bluetooth | |
| parent | bff7d3f06a2ff8036e310e2e7a4192c4bed4a9da (diff) | |
| download | linux-f3d02a6c4f7d683e301d600e0736c09fcb8fa899.tar.xz | |
Bluetooth: Fix LE connection timeout deadlock
commit 980ffc0a2cec2c37589cc97993e1ad17252f4f47 upstream.
The le_conn_timeout() may call hci_le_conn_failed() which in turn may
call hci_conn_del(). Trying to use the _sync variant for cancelling the
conn timeout from hci_conn_del() could therefore result in a deadlock.
This patch converts hci_conn_del() to use the non-sync variant so the
deadlock is not possible.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index b9517bd17190..f07933e5c428 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -517,7 +517,7 @@ int hci_conn_del(struct hci_conn *conn) /* Unacked frames */ hdev->acl_cnt += conn->sent; } else if (conn->type == LE_LINK) { - cancel_delayed_work_sync(&conn->le_conn_timeout); + cancel_delayed_work(&conn->le_conn_timeout); if (hdev->le_pkts) hdev->le_cnt += conn->sent; |