ocfs2: Annotate struct ocfs2_replay_map with __counted_by
PATCH 1/1 ocfs2: Annotate struct ocfs2_replay_map 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_replay_map.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- fs/ocfs2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/journal.c +1 -1
@@ -90,7 +90,7 @@ enum ocfs2_replay_state {struct ocfs2_replay_map {unsigned int rm_slots;enum ocfs2_replay_state rm_state; -unsigned char rm_replay_slots[]; + unsigned char rm_replay_slots[] __counted_by(rm_slots); };static void ocfs2_replay_map_set_state (struct ocfs2_super *osb,int state)
Signature · 1 line
2.34.1
Quoted 10 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structocfs2_replay_map.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 9 lines
Cc Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Cc Joseph Qi <[email protected]>Cc Nathan Chancellor <[email protected]>Cc Nick Desaulniers <[email protected]>Cc Tom Rix <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- fs/ocfs2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/ocfs2/journal.c +1
-1@@ -90,7 +90,7 @@ enum ocfs2_replay_state {struct ocfs2_replay_map {unsigned int rm_slots;enum ocfs2_replay_state rm_state; -unsigned char rm_replay_slots[]; + unsigned char rm_replay_slots[] __counted_by(rm_slots); };static void ocfs2_replay_map_set_state (struct ocfs2_super *osb,int state)
Quoted 10 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structocfs2_replay_map.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 9 lines
Cc Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Cc Joseph Qi <[email protected]>Cc Nathan Chancellor <[email protected]>Cc Nick Desaulniers <[email protected]>Cc Tom Rix <[email protected]>Signed-off-by Kees Cook <[email protected]>
Quoted 17 lines
--- fs/ocfs2/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/ocfs2/journal.c +1
-1@@ -90,7 +90,7 @@ enum ocfs2_replay_state {struct ocfs2_replay_map {unsigned int rm_slots;enum ocfs2_replay_state rm_state; -unsigned char rm_replay_slots[]; + unsigned char rm_replay_slots[] __counted_by(rm_slots); };static void ocfs2_replay_map_set_state (struct ocfs2_super *osb,int state)