Skip to content

Commit 08b2771

Browse files
westerigregkh
authored andcommitted
thunderbolt: Fix KASAN reported stack out-of-bounds read in tb_retimer_scan()
commit e9e1b20 upstream. KASAN reported following issue: BUG: KASAN: stack-out-of-bounds in tb_retimer_scan+0xffe/0x1550 [thunderbolt] Read of size 4 at addr ffff88810111fc1c by task kworker/u56:0/11 CPU: 0 UID: 0 PID: 11 Comm: kworker/u56:0 Tainted: G U 6.11.0+ #1387 Tainted: [U]=USER Workqueue: thunderbolt0 tb_handle_hotplug [thunderbolt] Call Trace: <TASK> dump_stack_lvl+0x6c/0x90 print_report+0xd1/0x630 kasan_report+0xdb/0x110 __asan_report_load4_noabort+0x14/0x20 tb_retimer_scan+0xffe/0x1550 [thunderbolt] tb_scan_port+0xa6f/0x2060 [thunderbolt] tb_handle_hotplug+0x17b1/0x3080 [thunderbolt] process_one_work+0x626/0x1100 worker_thread+0x6c8/0xfa0 kthread+0x2c8/0x3a0 ret_from_fork+0x3a/0x80 ret_from_fork_asm+0x1a/0x30 This happens because the loop variable still gets incremented by one so max becomes 3 instead of 2, and this makes the second loop read past the the array declared on the stack. Fix this by assigning to max directly in the loop body. Fixes: ff6ab05 ("thunderbolt: Add receiver lane margining support for retimers") CC: [email protected] Signed-off-by: Mika Westerberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 794ba27 commit 08b2771

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/thunderbolt/retimer.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ int tb_retimer_scan(struct tb_port *port, bool add)
516516
*/
517517
tb_retimer_set_inbound_sbtx(port);
518518

519-
for (i = 1; i <= TB_MAX_RETIMER_INDEX; i++) {
519+
for (max = 1, i = 1; i <= TB_MAX_RETIMER_INDEX; i++) {
520520
/*
521521
* Last retimer is true only for the last on-board
522522
* retimer (the one connected directly to the Type-C
@@ -527,9 +527,10 @@ int tb_retimer_scan(struct tb_port *port, bool add)
527527
last_idx = i;
528528
else if (ret < 0)
529529
break;
530+
531+
max = i;
530532
}
531533

532-
max = i;
533534
ret = 0;
534535

535536
/* Add retimers if they do not exist already */

0 commit comments

Comments
 (0)