diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-05 08:50:41 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-05 08:50:41 -1000 |
| commit | 1cfb751165ef685b80635218beff38d6afbce4e2 (patch) | |
| tree | 204bbaf4be47a12d2909e15d076696d1686ac660 | |
| parent | 3d05e493e461c4469a9b73e00e59ea16e1d8a416 (diff) | |
| parent | c12d7aa7ffa4c61443241fbc1ee405acf4aa17de (diff) | |
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
| -rw-r--r-- | drivers/firewire/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index 2a05f411328f..95c10f3d2282 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) |