]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ALSA: hda: Annotate struct hda_conn_list with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:50:42 +0000 (10:50 -0700)
committerTakashi Iwai <tiwai@suse.de>
Sat, 23 Sep 2023 10:36:45 +0000 (12:36 +0200)
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>
Link: https://lore.kernel.org/r/20230922175042.work.547-kees@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_codec.c

index 33af707a65ab112e2e8afce53901aa2f8c52df43..01718b1fc9a7f851a97be58233b2e1c52e64c0b7 100644 (file)
@@ -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 */