浏览代码

Bluetooth: Clear RFCOMM session timer when disconnecting last channel

When the last RFCOMM data channel is closed, a timer is normally set
up to disconnect the control channel at a later time.  If the control
channel disconnect command is sent with the timer pending, the timer
needs to be cancelled.

If the timer is not cancelled in this situation, the reference
counting logic for the RFCOMM session does not work correctly when the
remote device closes the L2CAP connection.  The session is freed at
the wrong time, leading to a kernel panic.

Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Mat Martineau 13 年之前
父节点
当前提交
79e654787c
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      net/bluetooth/rfcomm/core.c

+ 1 - 0
net/bluetooth/rfcomm/core.c

@@ -1146,6 +1146,7 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
 			if (list_empty(&s->dlcs)) {
 			if (list_empty(&s->dlcs)) {
 				s->state = BT_DISCONN;
 				s->state = BT_DISCONN;
 				rfcomm_send_disc(s, 0);
 				rfcomm_send_disc(s, 0);
+				rfcomm_session_clear_timer(s);
 			}
 			}
 
 
 			break;
 			break;