From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 27 Feb 2008 01:42:56 +0000 (-0800)
Subject: bluetooth: delete timer in l2cap_conn_del()
X-Git-Tag: v2.6.25-rc4~148^2~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3ab2273175bd59616b6e85c0f88b154e8bd97413;p=linux-2.6-omap-h63xx.git

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/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>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a8811c0a0ce..7c5459c8e8e 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -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);
 }