Skip to content

Commit 8a5b013

Browse files
Cen ZhangVudentz
authored andcommitted
Bluetooth: SCO: fix race conditions in sco_sock_connect()
sco_sock_connect() checks sk_state and sk_type without holding the socket lock. Two concurrent connect() syscalls on the same socket can both pass the check and enter sco_connect(), leading to use-after-free. The buggy scenario involves three participants and was confirmed with additional logging instrumentation: Thread A (connect): HCI disconnect: Thread B (connect): sco_sock_connect(sk) sco_sock_connect(sk) sk_state==BT_OPEN sk_state==BT_OPEN (pass, no lock) (pass, no lock) sco_connect(sk): sco_connect(sk): hci_dev_lock hci_dev_lock hci_connect_sco <- blocked -> hcon1 sco_conn_add->conn1 lock_sock(sk) sco_chan_add: conn1->sk = sk sk->conn = conn1 sk_state=BT_CONNECT release_sock hci_dev_unlock hci_dev_lock sco_conn_del: lock_sock(sk) sco_chan_del: sk->conn=NULL conn1->sk=NULL sk_state= BT_CLOSED SOCK_ZAPPED release_sock hci_dev_unlock (unblocked) hci_connect_sco -> hcon2 sco_conn_add -> conn2 lock_sock(sk) sco_chan_add: sk->conn=conn2 sk_state= BT_CONNECT // zombie sk! release_sock hci_dev_unlock Thread B revives a BT_CLOSED + SOCK_ZAPPED socket back to BT_CONNECT. Subsequent cleanup triggers double sock_put() and use-after-free. Meanwhile conn1 is leaked as it was orphaned when sco_conn_del() cleared the association. Fix this by: - Moving lock_sock() before the sk_state/sk_type checks in sco_sock_connect() to serialize concurrent connect attempts - Fixing the sk_type != SOCK_SEQPACKET check to actually return the error instead of just assigning it - Adding a state re-check in sco_connect() after lock_sock() to catch state changes during the window between the locks - Adding sco_pi(sk)->conn check in sco_chan_add() to prevent double-attach of a socket to multiple connections - Adding hci_conn_drop() on sco_chan_add failure to prevent HCI connection leaks Fixes: 9a8ec9e ("Bluetooth: SCO: Fix possible circular locking dependency on sco_connect_cfm") Signed-off-by: Cen Zhang <zzzccc427@gmail.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
1 parent a834a0b commit 8a5b013

1 file changed

Lines changed: 21 additions & 5 deletions

File tree

net/bluetooth/sco.c

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static int sco_chan_add(struct sco_conn *conn, struct sock *sk,
298298
int err = 0;
299299

300300
sco_conn_lock(conn);
301-
if (conn->sk)
301+
if (conn->sk || sco_pi(sk)->conn)
302302
err = -EBUSY;
303303
else
304304
__sco_chan_add(conn, sk, parent);
@@ -353,9 +353,20 @@ static int sco_connect(struct sock *sk)
353353

354354
lock_sock(sk);
355355

356+
/* Recheck state after reacquiring the socket lock, as another
357+
* thread may have changed it (e.g., closed the socket).
358+
*/
359+
if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND) {
360+
release_sock(sk);
361+
hci_conn_drop(hcon);
362+
err = -EBADFD;
363+
goto unlock;
364+
}
365+
356366
err = sco_chan_add(conn, sk, NULL);
357367
if (err) {
358368
release_sock(sk);
369+
hci_conn_drop(hcon);
359370
goto unlock;
360371
}
361372

@@ -656,13 +667,18 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr_unsized *addr,
656667
addr->sa_family != AF_BLUETOOTH)
657668
return -EINVAL;
658669

659-
if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND)
670+
lock_sock(sk);
671+
672+
if (sk->sk_state != BT_OPEN && sk->sk_state != BT_BOUND) {
673+
release_sock(sk);
660674
return -EBADFD;
675+
}
661676

662-
if (sk->sk_type != SOCK_SEQPACKET)
663-
err = -EINVAL;
677+
if (sk->sk_type != SOCK_SEQPACKET) {
678+
release_sock(sk);
679+
return -EINVAL;
680+
}
664681

665-
lock_sock(sk);
666682
/* Set destination address and psm */
667683
bacpy(&sco_pi(sk)->dst, &sa->sco_bdaddr);
668684
release_sock(sk);

0 commit comments

Comments
 (0)