Merge tag 'firewire-fixes-7.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

a0ff06b3 · Linus Torvalds <[email protected]> · 2026-10-18 08:13:58 -10:00

Pull firewire fix from Takashi Sakamoto:
 "Fix a regression introduced in v6.19. It affects cancellation of the
  timer for split transaction timeout when handling a response. The
  issue is unlikely to occur in practice"

* tag 'firewire-fixes-7.3-final' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: fix race condition in split transaction handling

Commit: a0ff06b3a7bd3aa0cd99d0294e60b3ed28c9bfac
Parents: 53cbbb09 · 7f9f2d6a

Merge commit. Changes below are compared with the first parent: 53cbbb09.

Changes

1 files changed · +6 −2

File	Status	Add	Del	Content
drivers/firewire/core-transaction.c	modified	+6	−2	View file

drivers/firewire/core-transaction.c

View file

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 22ae387..0160705 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -89,8 +89,12 @@ void fw_cancel_pending_transactions(struct fw_card *card)
 			break;						\
 		}							\
 	}								\
-	if (t && try_cancel_split_timeout(t))				\
-		remove_transaction_entry(card, t);			\
+	if (t) {							\
+		if (try_cancel_split_timeout(t))			\
+			remove_transaction_entry(card, t);		\
+		else							\
+			t = NULL;					\
+	}								\
 	t;								\
 })
 