Merge tag 'thunderbolt-for-v7.3-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:

thunderbolt: Fixes for v7.3-rc3

This includes following USB4/Thunderbolt fixes:

  - Fix various issues around asynchronous DisplayPort tunnel activation
    when there is no graphics driver doing doing the capability
    exchange.
  - Fix potential NULL pointer dereference when XDomain connection is
    removed.
  - Fix use-after-free when control channel request is canceled.
  - Fix lockdep false positive.
  - Revert a commit that causes XDomain properties ping-pong.

All these have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v7.3-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  Revert "thunderbolt: xdomain: Notify peers after enumeration"
  thunderbolt: Use separate lock class for each ring
  thunderbolt: Fix KASAN reported use-after-free when request is canceled
  thunderbolt: Fix NULL dereference in tb_remove_work()
  thunderbolt: Tear down inactive DP tunnels when the domain is stopped
  thunderbolt: Mark discovered tunnels as active
  thunderbolt: Don't access a DP tunnel after its DPRX read was canceled
  thunderbolt: Fix domain reference leak when DPRX read is canceled
  thunderbolt: Make the DP tunnel activation callback mandatory
  thunderbolt: Hold a router reference for each allocated HopID

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index d48623fda79b..b62dfa52b149 100644
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -22,6 +22,7 @@ struct device;
 #include <linux/device.h>
 #include <linux/idr.h>
 #include <linux/list.h>
+#include <linux/lockdep.h>
 #include <linux/mutex.h>
 #include <linux/device-id/tb.h>
 #include <linux/pci.h>
@@ -565,6 +566,7 @@ struct tb_nhi {
  * @interval_nsec: Interval counter if interrupt throttling is to be
  *		   used with this ring (in ns)
  * @wait: Used to signal that the ring may be empty now
+ * @lock_key: Lock validator class key per-ring
  */
 struct tb_ring {
 	spinlock_t lock;
@@ -590,6 +592,7 @@ struct tb_ring {
 	void *poll_data;
 	unsigned int interval_nsec;
 	wait_queue_head_t wait;
+	struct lock_class_key lock_key;
 };
 
 /* Leave ring interrupt enabled on suspend */