Bluetooth: cmtp: Fix deadlock in session deletion
Commit fada4ac339
introduced the usage of kthread API.
kthread_stop is a blocking function which returns only when
the thread exits. In this case, the thread can't exit because it's
waiting for the write lock, which is being held by cmtp_del_connection()
which is waiting for the thread to exit -- deadlock.
Revert cmtp_reset_ctr to its original behavior: non-blocking signalling
for the session to terminate.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Родитель
751c10a568
Коммит
7176522cdc
|
@ -386,7 +386,8 @@ static void cmtp_reset_ctr(struct capi_ctr *ctrl)
|
|||
|
||||
capi_ctr_down(ctrl);
|
||||
|
||||
kthread_stop(session->task);
|
||||
atomic_inc(&session->terminate);
|
||||
wake_up_process(session->task);
|
||||
}
|
||||
|
||||
static void cmtp_register_appl(struct capi_ctr *ctrl, __u16 appl, capi_register_params *rp)
|
||||
|
|
|
@ -81,6 +81,7 @@ struct cmtp_session {
|
|||
|
||||
char name[BTNAMSIZ];
|
||||
|
||||
atomic_t terminate;
|
||||
struct task_struct *task;
|
||||
|
||||
wait_queue_head_t wait;
|
||||
|
|
|
@ -295,7 +295,7 @@ static int cmtp_session(void *arg)
|
|||
while (1) {
|
||||
set_current_state(TASK_INTERRUPTIBLE);
|
||||
|
||||
if (kthread_should_stop())
|
||||
if (atomic_read(&session->terminate))
|
||||
break;
|
||||
if (sk->sk_state != BT_CONNECTED)
|
||||
break;
|
||||
|
@ -416,7 +416,8 @@ int cmtp_del_connection(struct cmtp_conndel_req *req)
|
|||
skb_queue_purge(&session->transmit);
|
||||
|
||||
/* Stop session thread */
|
||||
kthread_stop(session->task);
|
||||
atomic_inc(&session->terminate);
|
||||
wake_up_process(session->task);
|
||||
} else
|
||||
err = -ENOENT;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче