Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

thunderbolt: Fix use-after-free in tb_dp_dprx_work

The original code relies on cancel_delayed_work() in tb_dp_dprx_stop(),
which does not ensure that the delayed work item tunnel->dprx_work has
fully completed if it was already running. This leads to use-after-free
scenarios where tb_tunnel is deallocated by tb_tunnel_put(), while
tunnel->dprx_work remains active and attempts to dereference tb_tunnel
in tb_dp_dprx_work().

A typical race condition is illustrated below:

CPU 0 | CPU 1
tb_dp_tunnel_active() |
tb_deactivate_and_free_tunnel()| tb_dp_dprx_start()
tb_tunnel_deactivate() | queue_delayed_work()
tb_dp_activate() |
tb_dp_dprx_stop() | tb_dp_dprx_work() //delayed worker
cancel_delayed_work() |
tb_tunnel_put(tunnel); |
| tunnel = container_of(...); //UAF
| tunnel-> //UAF

Replacing cancel_delayed_work() with cancel_delayed_work_sync() is
not feasible as it would introduce a deadlock: both tb_dp_dprx_work()
and the cleanup path acquire tb->lock, and cancel_delayed_work_sync()
would wait indefinitely for the work item that cannot proceed.

Instead, implement proper reference counting:
- If cancel_delayed_work() returns true (work is pending), we release
the reference in the stop function.
- If it returns false (work is executing or already completed), the
reference is released in delayed work function itself.

This ensures the tb_tunnel remains valid during work item execution
while preventing memory leaks.

This bug was found by static analysis.

Fixes: d6d458d42e1e ("thunderbolt: Handle DisplayPort tunnel activation asynchronously")
Cc: stable@vger.kernel.org
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

authored by

Duoming Zhou and committed by
Mika Westerberg
67600ccf ea6bb47f

+3 -2
+3 -2
drivers/thunderbolt/tunnel.c
··· 1079 1079 1080 1080 if (tunnel->callback) 1081 1081 tunnel->callback(tunnel, tunnel->callback_data); 1082 + tb_tunnel_put(tunnel); 1082 1083 } 1083 1084 1084 1085 static int tb_dp_dprx_start(struct tb_tunnel *tunnel) ··· 1107 1106 if (tunnel->dprx_started) { 1108 1107 tunnel->dprx_started = false; 1109 1108 tunnel->dprx_canceled = true; 1110 - cancel_delayed_work(&tunnel->dprx_work); 1111 - tb_tunnel_put(tunnel); 1109 + if (cancel_delayed_work(&tunnel->dprx_work)) 1110 + tb_tunnel_put(tunnel); 1112 1111 } 1113 1112 } 1114 1113