Bluetooth: cmtp: Fix lost wakeup of session thread

Fix race condition which can result in missing the wakeup intended to stop the session thread. Signed-off-by: Peter Hurley <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
chewitt · Aug 11, 2011 · 3a3f5c7 · 3a3f5c7
1 parent 38d5755
commit 3a3f5c7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
@@ -292,9 +292,11 @@ static int cmtp_session(void *arg)
 
 	init_waitqueue_entry(&wait, current);
 	add_wait_queue(sk_sleep(sk), &wait);
-	while (!kthread_should_stop()) {
+	while (1) {
 		set_current_state(TASK_INTERRUPTIBLE);
 
+		if (kthread_should_stop())
+			break;
 		if (sk->sk_state != BT_CONNECTED)
 			break;
 
@@ -307,7 +309,7 @@ static int cmtp_session(void *arg)
 
 		schedule();
 	}
-	set_current_state(TASK_RUNNING);
+	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(sk_sleep(sk), &wait);
 
 	down_write(&cmtp_session_sem);