i2c: mux: demux-pinctrl: Annotate struct i2c_demux_pinctrl_priv with __counted_by
authorKees Cook <keescook@chromium.org>
Fri, 22 Sep 2023 17:49:59 +0000 (10:49 -0700)
committerWolfram Sang <wsa@kernel.org>
Sun, 24 Sep 2023 20:49:13 +0000 (22:49 +0200)
commit86f8a1ef96819d2ae62eaf3d89a0f0404348daa3
tree7c74ba29c03d8545e0bb97defadac875793b3da8
parent65917718fb8bc2c94df3d52c054116c0e2e640cc
i2c: mux: demux-pinctrl: Annotate struct i2c_demux_pinctrl_priv 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 i2c_demux_pinctrl_priv.
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

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
[wsa: improved blank lines]
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/muxes/i2c-demux-pinctrl.c