linux-hardening - Re: [PATCH] ASoC: soc-dapm: Annotate struct snd_soc_dapm_widget_list with __counted

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <509b7545-ca05-b806-2874-a38cbdbfe732@embeddedor.com>
Date: Wed, 4 Oct 2023 01:43:17 +0200
From: "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To: Kees Cook <keescook@...omium.org>, Liam Girdwood <lgirdwood@...il.com>
Cc: Mark Brown <broonie@...nel.org>, Jaroslav Kysela <perex@...ex.cz>,
 Takashi Iwai <tiwai@...e.com>, "Gustavo A. R. Silva"
 <gustavoars@...nel.org>, alsa-devel@...a-project.org,
 linux-hardening@...r.kernel.org, Nathan Chancellor <nathan@...nel.org>,
 Nick Desaulniers <ndesaulniers@...gle.com>, Tom Rix <trix@...hat.com>,
 linux-kernel@...r.kernel.org, llvm@...ts.linux.dev
Subject: Re: [PATCH] ASoC: soc-dapm: Annotate struct snd_soc_dapm_widget_list
 with __counted_by



On 10/4/23 01:28, 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 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 snd_soc_dapm_widget_list.
> Additionally, since the element count member must be set before accessing
> the annotated flexible array member, move its initialization earlier.
> 
> Cc: Liam Girdwood <lgirdwood@...il.com>
> Cc: Mark Brown <broonie@...nel.org>
> Cc: Jaroslav Kysela <perex@...ex.cz>
> Cc: Takashi Iwai <tiwai@...e.com>
> Cc: "Gustavo A. R. Silva" <gustavoars@...nel.org>
> Cc: alsa-devel@...a-project.org
> Cc: linux-hardening@...r.kernel.org
> Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci [1]
> Signed-off-by: Kees Cook <keescook@...omium.org>

Reviewed-by: Gustavo A. R. Silva <gustavoars@...nel.org>

Thanks
--
Gustavo

> ---
>   include/sound/soc-dapm.h | 2 +-
>   sound/soc/soc-dapm.c     | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
> index d2faec9a323e..51516c93916e 100644
> --- a/include/sound/soc-dapm.h
> +++ b/include/sound/soc-dapm.h
> @@ -717,7 +717,7 @@ struct snd_soc_dapm_context {
>   /* A list of widgets associated with an object, typically a snd_kcontrol */
>   struct snd_soc_dapm_widget_list {
>   	int num_widgets;
> -	struct snd_soc_dapm_widget *widgets[];
> +	struct snd_soc_dapm_widget *widgets[] __counted_by(num_widgets);
>   };
>   
>   #define for_each_dapm_widgets(list, i, widget)				\
> diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
> index 2512aadf95f7..2e3df47c9cf3 100644
> --- a/sound/soc/soc-dapm.c
> +++ b/sound/soc/soc-dapm.c
> @@ -497,8 +497,8 @@ static int dapm_kcontrol_add_widget(struct snd_kcontrol *kcontrol,
>   	if (!new_wlist)
>   		return -ENOMEM;
>   
> -	new_wlist->widgets[n - 1] = widget;
>   	new_wlist->num_widgets = n;
> +	new_wlist->widgets[n - 1] = widget;
>   
>   	data->wlist = new_wlist;
>