Skip to content

Commit

Permalink
bluetooth: delete timer in l2cap_conn_del()
Browse files Browse the repository at this point in the history
Delete a possibly armed timer before kfree'ing the connection object.

Solves: http://lkml.org/lkml/2008/2/15/514

Reported-by:Quel Qun <kelk1@comcast.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Thomas Gleixner authored and David S. Miller committed Feb 27, 2008
1 parent 5f2f40a commit 3ab2273
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
l2cap_sock_kill(sk);
}

del_timer_sync(&conn->info_timer);

hcon->l2cap_data = NULL;
kfree(conn);
}
Expand Down

0 comments on commit 3ab2273

Please sign in to comment.