Skip to contentSkip to conversation

Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready()

PATCH Applied [email protected] 4 participants 4 messages Mar 14, 2022 – Mar 16, 2022

Subsystems (2)
Bluetooth drivers Bluetooth
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH v2 1/1 Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready()

From: Gavin Li <[email protected]>

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

Signed-off-by Gavin Li <[email protected]>
---
 include/net/bluetooth/bluetooth.h | 2 +-
 net/bluetooth/af_bluetooth.c      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
include/net/bluetooth/bluetooth.h +1 -1
index a647e5fabdbd6..59f6e7675554e 100644
@@ -343,7 +343,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
index ee319779781e6..a0cb2e3da8d4c 100644
@@ -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);
Signature · 1 line
2.34.1
#1 lore raw

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=623339

---Test result---

Test Summary:

CheckPatch                    PASS      1.85 seconds
GitLint                       PASS      1.04 seconds
SubjectPrefix                 PASS      0.92 seconds
BuildKernel                   PASS      31.27 seconds
BuildKernel32                 PASS      27.91 seconds
Incremental Build with patchesPASS      38.17 seconds
TestRunner: Setup             PASS      478.89 seconds
TestRunner: l2cap-tester      PASS      15.81 seconds
TestRunner: bnep-tester       PASS      6.20 seconds
TestRunner: mgmt-tester       PASS      101.58 seconds
TestRunner: rfcomm-tester     PASS      8.03 seconds
TestRunner: sco-tester        PASS      7.81 seconds
TestRunner: smp-tester        PASS      7.77 seconds
TestRunner: userchan-tester   PASS      5.91 seconds

---
Regards,
Linux Bluetooth

maintainer
#2 lore raw
In reply to [email protected]

Hi Gavin,

Quoted 8 lines

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

Signed-off-by Gavin Li <[email protected]>

---
include/net/bluetooth/bluetooth.h | 2 +-
net/bluetooth/af_bluetooth.c | 4 ++--

2 files changed, 3 insertions(+), 3 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel

CI Applied
#3 lore raw
In reply to [email protected]
This patch was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <[email protected]>:

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master) by Marcel Holtmann <[email protected]>:

Quoted 8 lines · On Mon, 14 Mar 2022 15:42:52 -0700 you wrote:

From: Gavin Li <[email protected]>

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

Signed-off-by Gavin Li <[email protected]>

[...]

Here is the summary with links:
- [v2] Bluetooth: fix incorrect nonblock bitmask in bt_sock_wait_ready()
https://git.kernel.org/bluetooth/bluetooth-next/c/f09ab95cfdb4

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html