Commit da891217 authored by Gavin Li's avatar Gavin Li Committed by Marcel Holtmann
Browse files

Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready() 



Callers pass msg->msg_flags as flags, which contains MSG_DONTWAIT
instead of O_NONBLOCK.

Signed-off-by: default avatarGavin Li <gavin@matician.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 1f667e15

include/net/bluetooth/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg, 
__poll_t 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);

int  bt_sock_wait_ready(struct sock *sk, unsigned int msg_flags);



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

void bt_accept_unlink(struct sock *sk);

net/bluetooth/af_bluetooth.c

+2 −2
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ 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)

int bt_sock_wait_ready(struct sock *sk, unsigned int msg_flags)

{

	DECLARE_WAITQUEUE(wait, current);

	unsigned long timeo;
@@ -576,7 +576,7 @@ int bt_sock_wait_ready(struct sock *sk, unsigned long flags) 


	BT_DBG("sk %p", sk);



	timeo = sock_sndtimeo(sk, flags & O_NONBLOCK);

	timeo = sock_sndtimeo(sk, !!(msg_flags & MSG_DONTWAIT));



	add_wait_queue(sk_sleep(sk), &wait);

	set_current_state(TASK_INTERRUPTIBLE);