audit: Annotate struct audit_chunk with __counted_by
PATCH 1/1 audit: Annotate struct audit_chunk 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 audit_chunk.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/audit_tree.c +1 -1
@@ -34,7 +34,7 @@ struct audit_chunk {struct list_head list;struct audit_tree *owner;unsigned index;/* index; upper bit indicates 'will prune' */ - } owners[]; + } owners[] __counted_by(count); };struct audit_tree_mark {
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 8 lines
As found with Coccinelle[1], add
__counted_byfor structaudit_chunk.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Paul Moore <[email protected]>Cc Eric Paris <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
--
Gustavo
Quoted 17 lines
--- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/audit_tree.c +1
-1@@ -34,7 +34,7 @@ struct audit_chunk {struct list_head list;struct audit_tree *owner;unsigned index;/* index; upper bit indicates 'will prune' */ - } owners[]; + } owners[] __counted_by(count); };struct audit_tree_mark {
Paul Moore
maintainerQuoted 11 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 structaudit_chunk.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Paul Moore <[email protected]>Cc Eric Paris <[email protected]>Signed-off-by Kees Cook <[email protected]>--- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
This looks good to me, but considering we are currently at -rc6 I'd prefer to hold off until after the upcoming merge window. I'll send another note once it's been merged into audit/next.
Thanks.
Quoted 15 lines
kernel/audit_tree.c +1
-2@@ -34,7 +34,7 @@ struct audit_chunk {struct list_head list;struct audit_tree *owner;unsigned index;/* index; upper bit indicates 'will prune' */ - } owners[]; + } owners[] __counted_by(count); };struct audit_tree_mark { --2.34.1
Signature · 1 line
paul-moore.com
Quoted 11 lines · On Aug 17, 2023 Paul Moore <[email protected]> wrote:
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 structaudit_chunk.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Paul Moore <[email protected]>Cc Eric Paris <[email protected]>Signed-off-by Kees Cook <[email protected]>--- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Merged into audit/next, thanks.
--
paul-moore.com