]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gcov: annotate struct gcov_iterator with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:52:20 +0000 (10:52 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Wed, 18 Oct 2023 21:43:22 +0000 (14:43 -0700)
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 gcov_iterator.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Link: https://lkml.kernel.org/r/20230922175220.work.327-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Tom Rix <trix@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
kernel/gcov/fs.c

index 5c3086cad8f99e076f169311a79e4d6ff7cd3c21..01520689b57c1dd2052c7c2f6cb219944b8081d1 100644 (file)
@@ -99,7 +99,7 @@ struct gcov_iterator {
        struct gcov_info *info;
        size_t size;
        loff_t pos;
-       char buffer[];
+       char buffer[] __counted_by(size);
 };
 
 /**