Skip to content

Commit eb2d5e7

Browse files
sergey-senozhatskygregkh
authored andcommitted
thunderbolt: Do not double dequeue a configuration request
commit 0f73628 upstream. Some of our devices crash in tb_cfg_request_dequeue(): general protection fault, probably for non-canonical address 0xdead000000000122 CPU: 6 PID: 91007 Comm: kworker/6:2 Tainted: G U W 6.6.65 RIP: 0010:tb_cfg_request_dequeue+0x2d/0xa0 Call Trace: <TASK> ? tb_cfg_request_dequeue+0x2d/0xa0 tb_cfg_request_work+0x33/0x80 worker_thread+0x386/0x8f0 kthread+0xed/0x110 ret_from_fork+0x38/0x50 ret_from_fork_asm+0x1b/0x30 The circumstances are unclear, however, the theory is that tb_cfg_request_work() can be scheduled twice for a request: first time via frame.callback from ring_work() and second time from tb_cfg_request(). Both times kworkers will execute tb_cfg_request_dequeue(), which results in double list_del() from the ctl->request_queue (the list poison deference hints at it: 0xdead000000000122). Do not dequeue requests that don't have TB_CFG_REQUEST_ACTIVE bit set. Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: stable@vger.kernel.org Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b4fac3f commit eb2d5e7

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/thunderbolt/ctl.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ static void tb_cfg_request_dequeue(struct tb_cfg_request *req)
148148
struct tb_ctl *ctl = req->ctl;
149149

150150
mutex_lock(&ctl->request_queue_lock);
151+
if (!test_bit(TB_CFG_REQUEST_ACTIVE, &req->flags)) {
152+
mutex_unlock(&ctl->request_queue_lock);
153+
return;
154+
}
155+
151156
list_del(&req->list);
152157
clear_bit(TB_CFG_REQUEST_ACTIVE, &req->flags);
153158
if (test_bit(TB_CFG_REQUEST_CANCELED, &req->flags))

0 commit comments

Comments
 (0)