Commit 1cfb7511 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-updates-6.7' of... 

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

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
parents 3d05e493 c12d7aa7

drivers/firewire/core.h

+1 −1
Original line number Diff line number Diff line
@@ -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)