Skip to contentSkip to conversation

Patch "Bluetooth: cmtp: fix possible might sleep error in cmtp_session" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 27, 2017

Subsystems (2)
Stable branch Bluetooth
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Bluetooth: cmtp: fix possible might sleep error in cmtp_session

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
bluetooth-cmtp-fix-possible-might-sleep-error-in-cmtp_session.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From f06d977309d09253c744e54e75c5295ecc52b7b4 Mon Sep 17 00:00:00 2001

From: Jeffy Chen <[email protected]>
Date: Tue, 27 Jun 2017 17:34:43 +0800
Subject: Bluetooth: cmtp: fix possible might sleep error in cmtp_session

From: Jeffy Chen <[email protected]>

commit f06d977309d09253c744e54e75c5295ecc52b7b4 upstream.

It looks like cmtp_session has same pattern as the issue reported in old rfcomm:

	while (1) {
		set_current_state(TASK_INTERRUPTIBLE);
		if (condition)
			break;
		// may call might_sleep here
		schedule();
	}
	__set_current_state(TASK_RUNNING);

Which fixed at:
dfb2fae Bluetooth: Fix nested sleeps

So let's fix it at the same way, also follow the suggestion of:
https://lwn.net/Articles/628628/

Signed-off-by Jeffy Chen <[email protected]>
Reviewed-by Brian Norris <[email protected]>
Reviewed-by AL Yu-Chen Cho <[email protected]>
Signed-off-by Marcel Holtmann <[email protected]>
Cc Jiri Slaby <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 net/bluetooth/cmtp/core.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
net/bluetooth/cmtp/core.c +10 -7
@@ -280,16 +280,16 @@ static int cmtp_session(void *arg)
 	struct cmtp_session *session = arg;
 	struct sock *sk = session->sock->sk;
 	struct sk_buff *skb;
-	wait_queue_t wait;
+	DEFINE_WAIT_FUNC(wait, woken_wake_function);
 
 	BT_DBG("session %p", session);
 
 	set_user_nice(current, -15);
 
-	init_waitqueue_entry(&wait, current);
 	add_wait_queue(sk_sleep(sk), &wait);
 	while (1) {
-		set_current_state(TASK_INTERRUPTIBLE);
+		/* Ensure session->terminate is updated */
+		smp_mb__before_atomic();
 
 		if (atomic_read(&session->terminate))
 			break;

@@ -306,9 +306,8 @@ static int cmtp_session(void *arg)
 
 		cmtp_process_transmit(session);
 
-		schedule();
+		wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
 	}
-	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(sk_sleep(sk), &wait);
 
 	down_write(&cmtp_session_sem);

@@ -393,7 +392,7 @@ int cmtp_add_connection(struct cmtp_conn
 		err = cmtp_attach_device(session);
 		if (err < 0) {
 			atomic_inc(&session->terminate);
-			wake_up_process(session->task);
+			wake_up_interruptible(sk_sleep(session->sock->sk));
 			up_write(&cmtp_session_sem);
 			return err;
 		}

@@ -431,7 +430,11 @@ int cmtp_del_connection(struct cmtp_conn
 
 		/* Stop session thread */
 		atomic_inc(&session->terminate);
-		wake_up_process(session->task);
+
+		/* Ensure session->terminate is updated */
+		smp_mb__after_atomic();
+
+		wake_up_interruptible(sk_sleep(session->sock->sk));
 	} else
 		err = -ENOENT;

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/bluetooth-cmtp-fix-possible-might-sleep-error-in-cmtp_session.patch queue-4.12/bluetooth-hidp-fix-possible-might-sleep-error-in-hidp_session_thread.patch queue-4.12/bluetooth-bnep-fix-possible-might-sleep-error-in-bnep_session.patch