Merge tag 'firewire-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

1cfb7511 · Linus Torvalds <[email protected]> · 2023-11-05 08:50:41 -10:00

Pull firewire update from Takashi Sakamoto:
 "A slight change for flexible length of array in core function.

  Kees Cook provides a patch to annotate the array embedded in fw_node
  structure referring to structure member for the length of array. The
  annotation would be defined by future extension of C compilers, and
  used for access bound-check at run-time enabled by UBSAN and
  FORTIFY_SOURCE"

* tag 'firewire-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: Annotate struct fw_node with __counted_by

Commit: 1cfb751165ef685b80635218beff38d6afbce4e2
Parents: 3d05e493 · c12d7aa7

Merge commit. Changes below are compared with the first parent: 3d05e493.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/firewire/core.h	modified	+1	−1	View file

drivers/firewire/core.h

View file

diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
index 2a05f41..95c10f3 100644
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@ -191,7 +191,7 @@ struct fw_node {
 	/* Upper layer specific data. */
 	void *data;
 
-	struct fw_node *ports[];
+	struct fw_node *ports[] __counted_by(port_count);
 };
 
 static inline struct fw_node *fw_node_get(struct fw_node *node)