Skip to content

Commit

Permalink
Revert "Bluetooth: fix shutdown on SCO sockets"
Browse files Browse the repository at this point in the history
This reverts commit f21ca5f.

Quoth Gustavo F. Padovan:
  "Commit f21ca5f can cause a NULL
   dereference if we call shutdown in a bluetooth SCO socket and doesn't
   wait the shutdown completion to call close().  Please revert it.  I
   may have a fix for it soon, but we don't have time anymore, so revert
   is the way to go.  ;)"

Requested-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Linus Torvalds committed May 12, 2011
1 parent 0e6f76c commit ce84537
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions net/bluetooth/sco.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,15 +369,6 @@ static void __sco_sock_close(struct sock *sk)

case BT_CONNECTED:
case BT_CONFIG:
if (sco_pi(sk)->conn) {
sk->sk_state = BT_DISCONN;
sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
hci_conn_put(sco_pi(sk)->conn->hcon);
sco_pi(sk)->conn = NULL;
} else
sco_chan_del(sk, ECONNRESET);
break;

case BT_CONNECT:
case BT_DISCONN:
sco_chan_del(sk, ECONNRESET);
Expand Down

0 comments on commit ce84537

Please sign in to comment.