Skip to content

Commit e91673b

Browse files
committed
ocfs2: Annotate struct ocfs2_slot_info with __counted_by
Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct ocfs2_slot_info. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joseph Qi <joseph.qi@linux.alibaba.com> Cc: ocfs2-devel@lists.linux.dev Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org> Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> Link: https://lore.kernel.org/r/20230915201522.never.979-kees@kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
1 parent b7fa76e commit e91673b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/ocfs2/slot_map.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct ocfs2_slot_info {
3737
unsigned int si_blocks;
3838
struct buffer_head **si_bh;
3939
unsigned int si_num_slots;
40-
struct ocfs2_slot si_slots[];
40+
struct ocfs2_slot si_slots[] __counted_by(si_num_slots);
4141
};
4242

4343

0 commit comments

Comments
 (0)