diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-02 19:47:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-03-02 19:47:01 +0100 |
| commit | 3c4a311c2c15ef0fa07c225ee02197a316e10e00 (patch) | |
| tree | b937bf8322b2f45afd92c6dd1cd39965d02276eb | |
| parent | d206a76d7d2726f3b096037f2079ce0bd3ba329b (diff) | |
| parent | d3d17e23d1a0d1f959b4fa55b35f1802d9c584fa (diff) | |
| download | lsm-3c4a311c2c15ef0fa07c225ee02197a316e10e00.tar.gz | |
Merge tag 'thunderbolt-for-v6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes:
thunderbolt: Fix for v6.8-rc7
This includes one USB4/Thunderbolt fix for v6.8-rc7:
- Fix NULL pointer dereference in tb_port_update_credits() on
Apple Thunderbolt 1 hardware.
This has been in linux-next with no reported issues.
* tag 'thunderbolt-for-v6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
thunderbolt: Fix NULL pointer dereference in tb_port_update_credits()
| -rw-r--r-- | drivers/thunderbolt/switch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 900114ba4371b1..fad40c4bc71034 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -1249,6 +1249,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); } |