Commit e793dcf0 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag 



In the case of blocking sockets we should not proceed with sendmsg() if
the socket has the BT_SK_SUSPEND flag set. So far the code was only
ensuring that POLLOUT doesn't get set for non-blocking sockets using
poll() but there was no code in place to ensure that blocking sockets do
the right thing when writing to them.

This patch adds a new bt_sock_wait_ready helper function to sleep in the
sendmsg call if the BT_SK_SUSPEND flag is set, and wake up as soon as it
is unset. It also updates the L2CAP and RFCOMM sendmsg callbacks to take
advantage of this new helper function.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 69c4e4e8

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock, 
uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);

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_unlink(struct sock *sk);

net/bluetooth/af_bluetooth.c

+40 −0
Original line number Diff line number Diff line
@@ -525,6 +525,46 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo) 
}

EXPORT_SYMBOL(bt_sock_wait_state);



/* This function expects the sk lock to be held when called */

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

{

	DECLARE_WAITQUEUE(wait, current);

	unsigned long timeo;

	int err = 0;



	BT_DBG("sk %p", sk);



	timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);



	add_wait_queue(sk_sleep(sk), &wait);

	set_current_state(TASK_INTERRUPTIBLE);

	while (test_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags)) {

		if (!timeo) {

			err = -EAGAIN;

			break;

		}



		if (signal_pending(current)) {

			err = sock_intr_errno(timeo);

			break;

		}



		release_sock(sk);

		timeo = schedule_timeout(timeo);

		lock_sock(sk);

		set_current_state(TASK_INTERRUPTIBLE);



		err = sock_error(sk);

		if (err)

			break;

	}

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(sk_sleep(sk), &wait);



	return err;

}

EXPORT_SYMBOL(bt_sock_wait_ready);



#ifdef CONFIG_PROC_FS

struct bt_seq_state {

	struct bt_sock_list *l;

net/bluetooth/l2cap_sock.c

+6 −0
Original line number Diff line number Diff line
@@ -777,6 +777,12 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
	if (sk->sk_state != BT_CONNECTED)

		return -ENOTCONN;



	lock_sock(sk);

	err = bt_sock_wait_ready(sk, msg->msg_flags);

	release_sock(sk);

	if (err)

		return err;



	l2cap_chan_lock(chan);

	err = l2cap_chan_send(chan, msg, len, sk->sk_priority);

	l2cap_chan_unlock(chan);

net/bluetooth/rfcomm/sock.c

+6 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
	struct sock *sk = sock->sk;

	struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;

	struct sk_buff *skb;

	int sent = 0;

	int sent;



	if (test_bit(RFCOMM_DEFER_SETUP, &d->flags))

		return -ENOTCONN;
@@ -559,6 +559,10 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 


	lock_sock(sk);



	sent = bt_sock_wait_ready(sk, msg->msg_flags);

	if (sent)

		goto done;



	while (len) {

		size_t size = min_t(size_t, len, d->mtu);

		int err;
@@ -594,6 +598,7 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
		len  -= size;

	}



done:

	release_sock(sk);



	return sent;

CRA Git | Maintained and supported by SUSTech CRA and CCSE