diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2024-10-01 12:34:06 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-14 20:03:56 +0100 |
| commit | c55a4c5a04bae40dcdc1e1c19d8eb79a06fb3397 (patch) | |
| tree | 25ce47ecc30fcdfbcd9a0e71e694dd8e319eb5e9 | |
| parent | 1de7ce1a88cdd0575c1a2ca638cdb40db995a469 (diff) | |
| download | linux-c55a4c5a04bae40dcdc1e1c19d8eb79a06fb3397.tar.gz linux-c55a4c5a04bae40dcdc1e1c19d8eb79a06fb3397.tar.bz2 linux-c55a4c5a04bae40dcdc1e1c19d8eb79a06fb3397.zip | |
Bluetooth: hci_conn: Use disable_delayed_work_sync
[ Upstream commit 2b0f2fc9ed62e73c95df1fa8ed2ba3dac54699df ]
This makes use of disable_delayed_work_sync instead
cancel_delayed_work_sync as it not only cancel the ongoing work but also
disables new submit which is disarable since the object holding the work
is about to be freed.
Reported-by: syzbot+2446dd3cb07277388db6@syzkaller.appspotmail.com
Tested-by: syzbot+2446dd3cb07277388db6@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=2446dd3cb07277388db6
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/bluetooth/hci_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index a1dfd865d61a..e6591f487a51 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -1128,9 +1128,9 @@ void hci_conn_del(struct hci_conn *conn) hci_conn_unlink(conn); - cancel_delayed_work_sync(&conn->disc_work); - cancel_delayed_work_sync(&conn->auto_accept_work); - cancel_delayed_work_sync(&conn->idle_work); + disable_delayed_work_sync(&conn->disc_work); + disable_delayed_work_sync(&conn->auto_accept_work); + disable_delayed_work_sync(&conn->idle_work); if (conn->type == ACL_LINK) { /* Unacked frames */ |