Browse Source

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>
Thomas Gleixner 17 năm trước cách đây
mục cha
commit
3ab2273175
1 tập tin đã thay đổi với 2 bổ sung0 xóa
  1. 2 0
      net/bluetooth/l2cap.c

+ 2 - 0
net/bluetooth/l2cap.c

@@ -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);
 }
 }