korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usx2y: Annotate struct snd_usx2y_urb_seq with __counted_by

Browse Source 
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>
This commit is contained in:
Kees Cook 2023-09-22 10:50:47 -07:00 committed by Takashi Iwai
parent 81420faff0
commit f5cc9cdfc9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/usb/usx2y/usbusx2y.h
View File

@ -18,7 +18,7 @@ struct snd_usx2y_async_seq {
struct snd_usx2y_urb_seq { struct snd_usx2y_urb_seq {
int submitted; int submitted;
int len; int len;
struct urb *urb[]; struct urb *urb[] __counted_by(len);
}; };
#include "usx2yhwdeppcm.h" #include "usx2yhwdeppcm.h"

2
sound/usb/usx2y/usbusx2yaudio.c
View File

@ -681,6 +681,7 @@ static int usx2y_rate_set(struct usx2ydev *usx2y, int rate)
err = -ENOMEM; err = -ENOMEM;
goto cleanup; goto cleanup;
} }
us->len = NOOF_SETRATE_URBS;
usbdata = kmalloc_array(NOOF_SETRATE_URBS, sizeof(int), usbdata = kmalloc_array(NOOF_SETRATE_URBS, sizeof(int),
GFP_KERNEL); GFP_KERNEL);
if (!usbdata) { if (!usbdata) {
@ -702,7 +703,6 @@ static int usx2y_rate_set(struct usx2ydev *usx2y, int rate)
if (err < 0) if (err < 0)
goto cleanup; goto cleanup;
us->submitted = 0; us->submitted = 0;
us->len = NOOF_SETRATE_URBS;
usx2y->us04 = us; usx2y->us04 = us;
wait_event_timeout(usx2y->in04_wait_queue, !us->len, HZ); wait_event_timeout(usx2y->in04_wait_queue, !us->len, HZ);
usx2y->us04 = NULL; usx2y->us04 = NULL;