* [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by
@ 2023-09-22 17:50 Kees Cook
2023-09-23 10:37 ` Takashi Iwai
2023-09-23 16:30 ` Gustavo A. R. Silva
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-22 17:50 UTC (permalink / raw)
To: Jaroslav Kysela
Cc: Kees Cook, Takashi Iwai, Cezary Rojewski, alsa-devel,
Nathan Chancellor, Nick Desaulniers, Tom Rix, Kai Vehmanen,
Jason Montleon, 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 hda_conn_list.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
sound/pci/hda/hda_codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 33af707a65ab..01718b1fc9a7 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -88,7 +88,7 @@ struct hda_conn_list {
struct list_head list;
int len;
hda_nid_t nid;
- hda_nid_t conns[];
+ hda_nid_t conns[] __counted_by(len);
};
/* look up the cached results */
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by
2023-09-22 17:50 [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by Kees Cook
@ 2023-09-23 10:37 ` Takashi Iwai
2023-09-23 16:30 ` Gustavo A. R. Silva
1 sibling, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2023-09-23 10:37 UTC (permalink / raw)
To: Kees Cook
Cc: Jaroslav Kysela, Takashi Iwai, Cezary Rojewski, alsa-devel,
Nathan Chancellor, Nick Desaulniers, Tom Rix, Kai Vehmanen,
Jason Montleon, linux-kernel, llvm, linux-hardening
On Fri, 22 Sep 2023 19:50:42 +0200,
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 hda_conn_list.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Cc: Cezary Rojewski <cezary.rojewski@intel.com>
> Cc: alsa-devel@alsa-project.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Applied now. Thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by
2023-09-22 17:50 [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by Kees Cook
2023-09-23 10:37 ` Takashi Iwai
@ 2023-09-23 16:30 ` Gustavo A. R. Silva
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-23 16:30 UTC (permalink / raw)
To: Kees Cook, Jaroslav Kysela
Cc: Takashi Iwai, Cezary Rojewski, alsa-devel, Nathan Chancellor,
Nick Desaulniers, Tom Rix, Kai Vehmanen, Jason Montleon,
linux-kernel, llvm, linux-hardening
On 9/22/23 11:50, 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 hda_conn_list.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Cc: Cezary Rojewski <cezary.rojewski@intel.com>
> Cc: alsa-devel@alsa-project.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> sound/pci/hda/hda_codec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
> index 33af707a65ab..01718b1fc9a7 100644
> --- a/sound/pci/hda/hda_codec.c
> +++ b/sound/pci/hda/hda_codec.c
> @@ -88,7 +88,7 @@ struct hda_conn_list {
> struct list_head list;
> int len;
> hda_nid_t nid;
> - hda_nid_t conns[];
> + hda_nid_t conns[] __counted_by(len);
> };
>
> /* look up the cached results */
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-23 12:24 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:50 [PATCH] ALSA: hda: Annotate struct hda_conn_list with __counted_by Kees Cook
2023-09-23 10:37 ` Takashi Iwai
2023-09-23 16:30 ` Gustavo A. R. Silva
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).