sparc: Annotate struct cpuinfo_tree with __counted_by
PATCH 1/1 sparc: Annotate struct cpuinfo_tree 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 cpuinfo_tree.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- arch/sparc/kernel/cpumap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/kernel/cpumap.c +1 -1
@@ -50,7 +50,7 @@ struct cpuinfo_tree {/* Offsets into nodes[] for each level of the tree */ struct cpuinfo_level level[CPUINFO_LVL_MAX ]; -struct cpuinfo_node nodes[]; + struct cpuinfo_node nodes[] __counted_by(total_nodes); };
Signature · 1 line
2.34.1
Quoted 6 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).
Quoted 7 lines
As found with Coccinelle[1], add
__counted_byfor structcpuinfo_tree.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc "David S. Miller" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- arch/sparc/kernel/cpumap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/sparc/kernel/cpumap.c +1
-1@@ -50,7 +50,7 @@ struct cpuinfo_tree {/* Offsets into nodes[] for each level of the tree */ struct cpuinfo_level level[CPUINFO_LVL_MAX ]; -struct cpuinfo_node nodes[]; + struct cpuinfo_node nodes[] __counted_by(total_nodes); };
Kees Cook
AppliedQuoted 9 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 structcpuinfo_tree.[...]
Since this is a trivial change and it's been 2 week without further discussion, I'll snag this patch.
Applied to for-next/hardening, thanks!
[1/1] sparc: Annotate struct cpuinfo_tree with __counted_by
https://git.kernel.org/kees/c/cfa36f889f23
Take care,
Signature · 1 line
Kees Cook