Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d368fc5 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Greg Kroah-Hartman
Browse files

Bluetooth: Fix locking in bt_accept_enqueue() for BH context 



commit c4f5627f7eeecde1bb6b646d8c0907b96dc2b2a6 upstream.

With commit e1633762 ("Bluetooth: Handle bt_accept_enqueue() socket
atomically") lock_sock[_nested]() is used to acquire the socket lock
before manipulating the socket. lock_sock[_nested]() may block, which
is problematic since bt_accept_enqueue() can be called in bottom half
context (e.g. from rfcomm_connect_ind()):

[<ffffff80080d81ec>] __might_sleep+0x4c/0x80
[<ffffff800876c7b0>] lock_sock_nested+0x24/0x58
[<ffffff8000d7c27c>] bt_accept_enqueue+0x48/0xd4 [bluetooth]
[<ffffff8000e67d8c>] rfcomm_connect_ind+0x190/0x218 [rfcomm]

Add a parameter to bt_accept_enqueue() to indicate whether the
function is called from BH context, and acquire the socket lock
with bh_lock_sock_nested() if that's the case.

Also adapt all callers of bt_accept_enqueue() to pass the new
parameter:

- l2cap_sock_new_connection_cb()
  - uses lock_sock() to lock the parent socket => process context

- rfcomm_connect_ind()
  - acquires the parent socket lock with bh_lock_sock() => BH
    context

- __sco_chan_add()
  - called from sco_chan_add(), which is called from sco_connect().
    parent is NULL, hence bt_accept_enqueue() isn't called in this
    code path and we can ignore it
  - also called from sco_conn_ready(). uses bh_lock_sock() to acquire
    the parent lock => BH context

Fixes: e1633762 ("Bluetooth: Handle bt_accept_enqueue() socket atomically")
Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43593a30

include/net/bluetooth/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg); 
int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);

int  bt_sock_wait_ready(struct sock *sk, unsigned long flags);



void bt_accept_enqueue(struct sock *parent, struct sock *sk);

void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh);

void bt_accept_unlink(struct sock *sk);

struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);

net/bluetooth/af_bluetooth.c

+13 −3
Original line number Diff line number Diff line
@@ -154,15 +154,25 @@ void bt_sock_unlink(struct bt_sock_list *l, struct sock *sk) 
}

EXPORT_SYMBOL(bt_sock_unlink);



void bt_accept_enqueue(struct sock *parent, struct sock *sk)

void bt_accept_enqueue(struct sock *parent, struct sock *sk, bool bh)

{

	BT_DBG("parent %p, sk %p", parent, sk);



	sock_hold(sk);



	if (bh)

		bh_lock_sock_nested(sk);

	else

		lock_sock_nested(sk, SINGLE_DEPTH_NESTING);



	list_add_tail(&bt_sk(sk)->accept_q, &bt_sk(parent)->accept_q);

	bt_sk(sk)->parent = parent;



	if (bh)

		bh_unlock_sock(sk);

	else

		release_sock(sk);



	parent->sk_ack_backlog++;

}

EXPORT_SYMBOL(bt_accept_enqueue);

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static struct l2cap_chan *l2cap_sock_new_connection_cb(struct l2cap_chan *chan) 


	l2cap_sock_init(sk, parent);



	bt_accept_enqueue(parent, sk);

	bt_accept_enqueue(parent, sk, false);



	release_sock(parent);

net/bluetooth/rfcomm/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc * 
	rfcomm_pi(sk)->channel = channel;



	sk->sk_state = BT_CONFIG;

	bt_accept_enqueue(parent, sk);

	bt_accept_enqueue(parent, sk, true);



	/* Accept connection and return socket DLC */

	*d = rfcomm_pi(sk)->dlc;

net/bluetooth/sco.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, 
	conn->sk = sk;



	if (parent)

		bt_accept_enqueue(parent, sk);

		bt_accept_enqueue(parent, sk, true);

}



static int sco_chan_add(struct sco_conn *conn, struct sock *sk,