Skip to contentSkip to conversation

thunderbolt: Fix NULL pointer dereference in tb_port_update_credits()

PATCH Applied Mika Westerberg 2 participants 5 messages Feb 12, 2024 – Feb 16, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thunderbolt: Fix NULL pointer dereference in tb_port_update_credits()

Olliver reported that his system crashes when plugging in Thunderbolt 1 device:

 BUG: kernel NULL pointer dereference, address: 0000000000000020
 #PF: supervisor read access in kernel mode
 #PF: error_code(0x0000) - not-present page
 PGD 0 P4D 0
 Oops: 0000 [#1] PREEMPT SMP NOPTI
 RIP: 0010:tb_port_do_update_credits+0x1b/0x130 [thunderbolt]
 Call Trace:
  <TASK>
  ? __die+0x23/0x70
  ? page_fault_oops+0x171/0x4e0
  ? exc_page_fault+0x7f/0x180
  ? asm_exc_page_fault+0x26/0x30
  ? tb_port_do_update_credits+0x1b/0x130
  ? tb_switch_update_link_attributes+0x83/0xd0
  tb_switch_add+0x7a2/0xfe0
  tb_scan_port+0x236/0x6f0
  tb_handle_hotplug+0x6db/0x900
  process_one_work+0x171/0x340
  worker_thread+0x27b/0x3a0
  ? __pfx_worker_thread+0x10/0x10
  kthread+0xe5/0x120
  ? __pfx_kthread+0x10/0x10
  ret_from_fork+0x31/0x50
  ? __pfx_kthread+0x10/0x10
  ret_from_fork_asm+0x1b/0x30
  </TASK>

This is due the fact that some Thunderbolt 1 devices only have one lane adapter. Fix this by checking for the lane 1 before we read its credits.

Fixes 81af2952e606 ("thunderbolt: Add support for asymmetric link")
Cc Gil Fine <[email protected]>

---
Hi Olliver,

I managed to reproduce this with a Thunderbolt 1 device. I wonder if you can try this patch and see if it fixes your issue too?

 drivers/thunderbolt/switch.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/thunderbolt/switch.c +3 -0
index bca6f28c553b..72ebde0e34d7 100644
@@ -1256,6 +1256,9 @@ int tb_port_update_credits(struct tb_port *port)
 	ret = tb_port_do_update_credits(port);
 	if (ret)
 		return ret;
+
+	if (!port->dual_link_port)
+		return 0;
 	return tb_port_do_update_credits(port->dual_link_port);
 }
 
Signature · 1 line
2.43.0
#1 lore raw

Hey Mika,

Quoted 39 lines · Mika Westerberg

Olliver reported that his system crashes when plugging in Thunderbolt 1 device:

  BUG: kernel NULL pointer dereference, address: 0000000000000020
  #PF: supervisor read access in kernel mode
  #PF: error_code(0x0000) - not-present page
  PGD 0 P4D 0
  Oops: 0000 [#1] PREEMPT SMP NOPTI
  RIP: 0010:tb_port_do_update_credits+0x1b/0x130 [thunderbolt]
  Call Trace:
   <TASK>
   ? __die+0x23/0x70
   ? page_fault_oops+0x171/0x4e0
   ? exc_page_fault+0x7f/0x180
   ? asm_exc_page_fault+0x26/0x30
   ? tb_port_do_update_credits+0x1b/0x130
   ? tb_switch_update_link_attributes+0x83/0xd0
   tb_switch_add+0x7a2/0xfe0
   tb_scan_port+0x236/0x6f0
   tb_handle_hotplug+0x6db/0x900
   process_one_work+0x171/0x340
   worker_thread+0x27b/0x3a0
   ? __pfx_worker_thread+0x10/0x10
   kthread+0xe5/0x120
   ? __pfx_kthread+0x10/0x10
   ret_from_fork+0x31/0x50
   ? __pfx_kthread+0x10/0x10
   ret_from_fork_asm+0x1b/0x30
   </TASK>

This is due the fact that some Thunderbolt 1 devices only have one lane adapter. Fix this by checking for the lane 1 before we read its credits.

Fixes 81af2952e606 ("thunderbolt: Add support for asymmetric link")
Cc Gil Fine <[email protected]>
Quoted 5 lines

---
Hi Olliver,

I managed to reproduce this with a Thunderbolt 1 device. I wonder if you can try this patch and see if it fixes your issue too?

That sounds reasonable, as it's an old Macbook (Should be TB2) with an old ethernet dongle (probably TB1?) or simply because it doesn't need that much speed (gbit adapter only). Sadly patching my kernel is not something I can do at the moment.

Olliver

Quoted 18 lines
  drivers/thunderbolt/switch.c | 3 +++
  1 file changed, 3 insertions(+)
drivers/thunderbolt/switch.c +3 -0
index bca6f28c553b..72ebde0e34d7 100644
@@ -1256,6 +1256,9 @@ int tb_port_update_credits(struct tb_port *port)
  	ret = tb_port_do_update_credits(port);
  	if (ret)
  		return ret;
+
+	if (!port->dual_link_port)
+		return 0;
  	return tb_port_do_update_credits(port->dual_link_port);
  }
 
#2 lore raw
Quoted 45 lines · Olliver Schinagl

Hey Mika,

Quoted 42 lines · Mika Westerberg

Olliver reported that his system crashes when plugging in Thunderbolt 1 device:

  BUG: kernel NULL pointer dereference, address: 0000000000000020
  #PF: supervisor read access in kernel mode
  #PF: error_code(0x0000) - not-present page
  PGD 0 P4D 0
  Oops: 0000 [#1] PREEMPT SMP NOPTI
  RIP: 0010:tb_port_do_update_credits+0x1b/0x130 [thunderbolt]
  Call Trace:
   <TASK>
   ? __die+0x23/0x70
   ? page_fault_oops+0x171/0x4e0
   ? exc_page_fault+0x7f/0x180
   ? asm_exc_page_fault+0x26/0x30
   ? tb_port_do_update_credits+0x1b/0x130
   ? tb_switch_update_link_attributes+0x83/0xd0
   tb_switch_add+0x7a2/0xfe0
   tb_scan_port+0x236/0x6f0
   tb_handle_hotplug+0x6db/0x900
   process_one_work+0x171/0x340
   worker_thread+0x27b/0x3a0
   ? __pfx_worker_thread+0x10/0x10
   kthread+0xe5/0x120
   ? __pfx_kthread+0x10/0x10
   ret_from_fork+0x31/0x50
   ? __pfx_kthread+0x10/0x10
   ret_from_fork_asm+0x1b/0x30
   </TASK>

This is due the fact that some Thunderbolt 1 devices only have one lane adapter. Fix this by checking for the lane 1 before we read its credits.

Fixes 81af2952e606 ("thunderbolt: Add support for asymmetric link")
Cc Gil Fine <[email protected]>

---
Hi Olliver,

Quoted 7 lines
Quoted 2 lines

I managed to reproduce this with a Thunderbolt 1 device. I wonder if you can try this patch and see if it fixes your issue too?

That sounds reasonable, as it's an old Macbook (Should be TB2) with an old ethernet dongle (probably TB1?) or simply because it doesn't need that much speed (gbit adapter only). Sadly patching my kernel is not something I can do at the moment.

Right, if you plug in a TB1 device into TB2 host, that's also same issue (TB1 devices don't always have two lane adapters).

It's fine if you cannot test this (but let me know if you want instructions). I can pick this into my fixes branch and send for -rc. It should land the arch Linux kernel tree at some point too, so you get it by upgrading the kernel.

#3 lore raw
Quoted 54 lines · Mika Westerberg
Quoted 45 lines · Olliver Schinagl

Hey Mika,

Quoted 42 lines · Mika Westerberg

Olliver reported that his system crashes when plugging in Thunderbolt 1 device:

   BUG: kernel NULL pointer dereference, address: 0000000000000020
   #PF: supervisor read access in kernel mode
   #PF: error_code(0x0000) - not-present page
   PGD 0 P4D 0
   Oops: 0000 [#1] PREEMPT SMP NOPTI
   RIP: 0010:tb_port_do_update_credits+0x1b/0x130 [thunderbolt]
   Call Trace:
    <TASK>
    ? __die+0x23/0x70
    ? page_fault_oops+0x171/0x4e0
    ? exc_page_fault+0x7f/0x180
    ? asm_exc_page_fault+0x26/0x30
    ? tb_port_do_update_credits+0x1b/0x130
    ? tb_switch_update_link_attributes+0x83/0xd0
    tb_switch_add+0x7a2/0xfe0
    tb_scan_port+0x236/0x6f0
    tb_handle_hotplug+0x6db/0x900
    process_one_work+0x171/0x340
    worker_thread+0x27b/0x3a0
    ? __pfx_worker_thread+0x10/0x10
    kthread+0xe5/0x120
    ? __pfx_kthread+0x10/0x10
    ret_from_fork+0x31/0x50
    ? __pfx_kthread+0x10/0x10
    ret_from_fork_asm+0x1b/0x30
    </TASK>

This is due the fact that some Thunderbolt 1 devices only have one lane adapter. Fix this by checking for the lane 1 before we read its credits.

Fixes 81af2952e606 ("thunderbolt: Add support for asymmetric link")
Cc Gil Fine <[email protected]>

---
Hi Olliver,

Quoted 7 lines
Quoted 2 lines

I managed to reproduce this with a Thunderbolt 1 device. I wonder if you can try this patch and see if it fixes your issue too?

That sounds reasonable, as it's an old Macbook (Should be TB2) with an old ethernet dongle (probably TB1?) or simply because it doesn't need that much speed (gbit adapter only). Sadly patching my kernel is not something I can do at the moment.

Quoted 7 lines

Right, if you plug in a TB1 device into TB2 host, that's also same issue (TB1 devices don't always have two lane adapters).

It's fine if you cannot test this (but let me know if you want instructions). I can pick this into my fixes branch and send for -rc. It should land the arch Linux kernel tree at some point too, so you get it by upgrading the kernel.

Yeah, I'll gently wait for it to land there. I'm using a 10/100Mbit USB adapter for those few times I need it :)

Thanks for looking into this!
Olliver

author Applied
#4 lore raw
In reply to Mika Westerberg
Quoted 33 lines · Mika Westerberg

Olliver reported that his system crashes when plugging in Thunderbolt 1 device:

 BUG: kernel NULL pointer dereference, address: 0000000000000020
 #PF: supervisor read access in kernel mode
 #PF: error_code(0x0000) - not-present page
 PGD 0 P4D 0
 Oops: 0000 [#1] PREEMPT SMP NOPTI
 RIP: 0010:tb_port_do_update_credits+0x1b/0x130 [thunderbolt]
 Call Trace:
  <TASK>
  ? __die+0x23/0x70
  ? page_fault_oops+0x171/0x4e0
  ? exc_page_fault+0x7f/0x180
  ? asm_exc_page_fault+0x26/0x30
  ? tb_port_do_update_credits+0x1b/0x130
  ? tb_switch_update_link_attributes+0x83/0xd0
  tb_switch_add+0x7a2/0xfe0
  tb_scan_port+0x236/0x6f0
  tb_handle_hotplug+0x6db/0x900
  process_one_work+0x171/0x340
  worker_thread+0x27b/0x3a0
  ? __pfx_worker_thread+0x10/0x10
  kthread+0xe5/0x120
  ? __pfx_kthread+0x10/0x10
  ret_from_fork+0x31/0x50
  ? __pfx_kthread+0x10/0x10
  ret_from_fork_asm+0x1b/0x30
  </TASK>

This is due the fact that some Thunderbolt 1 devices only have one lane adapter. Fix this by checking for the lane 1 before we read its credits.

Quoted 6 lines
Fixes 81af2952e606 ("thunderbolt: Add support for asymmetric link")
Cc Gil Fine <[email protected]>

Applied to thunderbolt.git/fixes.