* [PATCH] video: fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by
@ 2023-09-22 17:51 Kees Cook
2023-09-23 16:33 ` Gustavo A. R. Silva
0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:51 UTC (permalink / raw)
To: Helge Deller
Cc: Kees Cook, linux-fbdev, dri-devel, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
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>
---
drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
index 167585a889d3..719b99a9bc77 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
@@ -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)
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] video: fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by
2023-09-22 17:51 [PATCH] video: fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by Kees Cook
@ 2023-09-23 16:33 ` Gustavo A. R. Silva
2023-09-23 18:37 ` Helge Deller
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:33 UTC (permalink / raw)
To: Kees Cook, Helge Deller
Cc: linux-fbdev, dri-devel, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 9/22/23 11:51, Kees Cook wrote:
> 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>
Thanks
--
Gustavo
> ---
> drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
> index 167585a889d3..719b99a9bc77 100644
> --- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
> +++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.h
> @@ -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)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] video: fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by
2023-09-23 16:33 ` Gustavo A. R. Silva
@ 2023-09-23 18:37 ` Helge Deller
0 siblings, 0 replies; 3+ messages in thread
From: Helge Deller @ 2023-09-23 18:37 UTC (permalink / raw)
To: Gustavo A. R. Silva, Kees Cook
Cc: linux-fbdev, dri-devel, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 9/23/23 18:33, Gustavo A. R. Silva wrote:
> On 9/22/23 11:51, Kees Cook wrote:
>> 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>
Both fbdev patches applied to fbdev git tree.
Thank you Kees!
Helge
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-23 18:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 17:51 [PATCH] video: fbdev: mmp: Annotate struct mmphw_ctrl with __counted_by Kees Cook
2023-09-23 16:33 ` Gustavo A. R. Silva
2023-09-23 18:37 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).