]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
firewire: core: fix to update generation field in topology map
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Fri, 14 Nov 2025 14:44:21 +0000 (23:44 +0900)
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>
Sun, 16 Nov 2025 12:30:26 +0000 (21:30 +0900)
The generation field of topology map is updated after initialized by zero.
The updated value of generation field is always zero, and is against
specification.

This commit fixes the bug.

Fixes: 7d138cb269db ("firewire: core: use spin lock specific to topology map")
Link: https://lore.kernel.org/r/20251114144421.415278-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
drivers/firewire/core-topology.c

index 2f73bcd5696f2ba24ead7324d03ccebb5858c33f..ed3ae8cdb0cdb6d9de6ba26e6a7afac43f9f7f41 100644 (file)
@@ -441,12 +441,13 @@ static void update_topology_map(__be32 *buffer, size_t buffer_size, int root_nod
                                const u32 *self_ids, int self_id_count)
 {
        __be32 *map = buffer;
+       u32 next_generation = be32_to_cpu(buffer[1]) + 1;
        int node_count = (root_node_id & 0x3f) + 1;
 
        memset(map, 0, buffer_size);
 
        *map++ = cpu_to_be32((self_id_count + 2) << 16);
-       *map++ = cpu_to_be32(be32_to_cpu(buffer[1]) + 1);
+       *map++ = cpu_to_be32(next_generation);
        *map++ = cpu_to_be32((node_count << 16) | self_id_count);
 
        while (self_id_count--)