--- x/net/bluetooth/sco.c +++ y/net/bluetooth/sco.c @@ -191,8 +191,6 @@ static void sco_conn_del(struct hci_conn /* Kill socket */ sco_conn_lock(conn); sk = conn->sk; - if (sk) - sock_hold(sk); sco_conn_unlock(conn); if (sk) { @@ -217,6 +215,7 @@ static void __sco_chan_add(struct sco_co sco_pi(sk)->conn = conn; conn->sk = sk; + sock_hold(sk); if (parent) bt_accept_enqueue(parent, sk, true); @@ -296,6 +295,7 @@ static int sco_connect(struct sock *sk) sco_sock_set_timer(sk, sk->sk_sndtimeo); } + hci_conn_get(hcon); release_sock(sk); unlock: @@ -438,12 +438,14 @@ static void __sco_sock_close(struct sock case BT_CONNECTED: case BT_CONFIG: if (sco_pi(sk)->conn->hcon) { + struct hci_conn *hcon = sco_pi(sk)->conn->hcon; + sk->sk_state = BT_DISCONN; sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); sco_conn_lock(sco_pi(sk)->conn); - hci_conn_drop(sco_pi(sk)->conn->hcon); sco_pi(sk)->conn->hcon = NULL; sco_conn_unlock(sco_pi(sk)->conn); + hci_conn_put(hcon); } else sco_chan_del(sk, ECONNRESET); break;