Commit 3ab22731 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by David S. Miller

bluetooth: delete timer in l2cap_conn_del()

Delete a possibly armed timer before kfree'ing the connection object.

Solves: http://lkml.org/lkml/2008/2/15/514Reported-by: default avatarQuel Qun <kelk1@comcast.net>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f2f40a9
...@@ -417,6 +417,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) ...@@ -417,6 +417,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
l2cap_sock_kill(sk); l2cap_sock_kill(sk);
} }
del_timer_sync(&conn->info_timer);
hcon->l2cap_data = NULL; hcon->l2cap_data = NULL;
kfree(conn); kfree(conn);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment