Commit 3ab22731 authored Feb 26, 2008 by Thomas Gleixner Committed by David S. Miller Feb 26, 2008

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>

parent 5f2f40a9

net/bluetooth/l2cap.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}