fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:51:37 +0000 (10:51 -0700)
committerHelge Deller <deller@gmx.de>
Sat, 23 Sep 2023 18:35:14 +0000 (20:35 +0200)
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 mmphw_ctrl.

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

Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Helge Deller <deller@gmx.de>
drivers/video/fbdev/mmp/hw/mmp_ctrl.h

index 167585a..719b99a 100644 (file)
@@ -1406,7 +1406,7 @@ struct mmphw_ctrl {
 
        /*pathes*/
        int path_num;
-       struct mmphw_path_plat path_plats[];
+       struct mmphw_path_plat path_plats[] __counted_by(path_num);
 };
 
 static inline int overlay_is_vid(struct mmp_overlay *overlay)