firewire fixes for 6.12-rc5

This update includes a single commit to resolve a regression existing in
 v6.11 or later.
 
 The change in 1394 OHCI driver in v6.11 kernel could cause general
 protection faults when rediscovering nodes in IEEE 1394 bus while holding
 a spin lock. Consequently, watchdog checks can report a hard lockup.
 
 Currently, this issue is observed primarily during the system resume phase
 when using an extra node with three ports or more is used. However, it
 could potentially occur in the other cases as well.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQQE66IEYNDXNBPeGKSsLtaWM8LwEwUCZx3k/gAKCRCsLtaWM8Lw
 E7mlAP9Zw94KE2AvNDwRQrY9hLPkEVSdLZYcfG3zo0wDvLukeAEAh06k+B4ZpkVr
 KNd9Epb/dcouK6ucUqDlyY/R/64b2A0=
 =L4mg
 -----END PGP SIGNATURE-----

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

Pull firewire fix from Takashi Sakamoto:
 "A single commit to resolve a regression existing in v6.11 or later.

  The change in 1394 OHCI driver in v6.11 kernel could cause general
  protection faults when rediscovering nodes in IEEE 1394 bus while
  holding a spin lock. Consequently, watchdog checks can report a hard
  lockup.

  Currently, this issue is observed primarily during the system resume
  phase when using an extra node with three ports or more is used.
  However, it could potentially occur in the other cases as well"

* tag 'firewire-fixes-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: core: fix invalid port index for parent device
This commit is contained in:
Linus Torvalds 2024-10-27 08:36:01 -10:00
commit 7bec4657b0

View File

@ -204,7 +204,7 @@ static struct fw_node *build_tree(struct fw_card *card, const u32 *sid, int self
// the node->ports array where the parent node should be. Later, // the node->ports array where the parent node should be. Later,
// when we handle the parent node, we fix up the reference. // when we handle the parent node, we fix up the reference.
++parent_count; ++parent_count;
node->color = i; node->color = port_index;
break; break;
case PHY_PACKET_SELF_ID_PORT_STATUS_CHILD: case PHY_PACKET_SELF_ID_PORT_STATUS_CHILD: