diff mbox series

regulator: mc13xxx: Annotate struct mc13xxx_regulator_priv with __counted_by

Message ID 20230922175402.work.819-kees@kernel.org
State New
Headers
Series regulator: mc13xxx: Annotate struct mc13xxx_regulator_priv with __counted_by |

Commit Message

Kees Cook Sept. 22, 2023, 5:54 p.m. UTC 
  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 mc13xxx_regulator_priv.

[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/regulator/mc13xxx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gustavo A. R. Silva Sept. 23, 2023, 5:03 p.m. UTC | #1 
On Fri, Sep 22, 2023 at 10:54:02AM -0700, 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 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 mc13xxx_regulator_priv.
> 
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> 
> Cc: Liam Girdwood <lgirdwood@gmail.com>
> Cc: Mark Brown <broonie@kernel.org>
> Signed-off-by: Kees Cook <keescook@chromium.org>

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

Thanks
--
Gustavo

> ---
>  drivers/regulator/mc13xxx.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/regulator/mc13xxx.h b/drivers/regulator/mc13xxx.h
> index e03279dc43f4..057aaef6f086 100644
> --- a/drivers/regulator/mc13xxx.h
> +++ b/drivers/regulator/mc13xxx.h
> @@ -24,7 +24,7 @@ struct mc13xxx_regulator_priv {
>  	u32 powermisc_pwgt_state;
>  	struct mc13xxx_regulator *mc13xxx_regulators;
>  	int num_regulators;
> -	struct regulator_dev *regulators[];
> +	struct regulator_dev *regulators[] __counted_by(num_regulators);
>  };
>  
>  extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,
> -- 
> 2.34.1
> 
>
diff mbox series

Patch

diff --git a/drivers/regulator/mc13xxx.h b/drivers/regulator/mc13xxx.h
index e03279dc43f4..057aaef6f086 100644
--- a/drivers/regulator/mc13xxx.h
+++ b/drivers/regulator/mc13xxx.h
@@ -24,7 +24,7 @@  struct mc13xxx_regulator_priv {
 	u32 powermisc_pwgt_state;
 	struct mc13xxx_regulator *mc13xxx_regulators;
 	int num_regulators;
-	struct regulator_dev *regulators[];
+	struct regulator_dev *regulators[] __counted_by(num_regulators);
 };
 
 extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev,