ALSA: usx2y: Annotate struct snd_usx2y_urb_seq with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:50:47 +0000 (10:50 -0700)
committerTakashi Iwai <tiwai@suse.de>
Sat, 23 Sep 2023 10:36:59 +0000 (12:36 +0200)
commitf5cc9cdfc96fb1f26f986801cee473e2e68ba737
tree5f386f628fc7f2d982650be6f93849c30b3f5f50
parent81420faff0eb8603c6d5e5267455bddf70f20a95
ALSA: usx2y: Annotate struct snd_usx2y_urb_seq with __counted_by

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 snd_usx2y_urb_seq.
Additionally, since the element count member must be set before accessing
the annotated flexible array member, move its initialization earlier.

[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: alsa-devel@alsa-project.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230922175046.work.766-kees@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/usx2y/usbusx2y.h
sound/usb/usx2y/usbusx2yaudio.c