linux-hardening.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] leds: gpio: Annotate struct gpio_leds_priv with __counted_by
@ 2023-09-15 20:10 Kees Cook
  2023-09-15 20:47 ` Gustavo A. R. Silva
  2023-09-20 13:38 ` (subset) " Lee Jones
  0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-15 20:10 UTC (permalink / raw)
  To: Pavel Machek
  Cc: Kees Cook, Lee Jones, linux-leds, Nathan Chancellor,
	Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening

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 gpio_leds_priv.

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

Cc: Pavel Machek <pavel@ucw.cz>
Cc: Lee Jones <lee@kernel.org>
Cc: linux-leds@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/leds/leds-gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 7bfe40a6bfdd..a6597f0f3eb4 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -142,7 +142,7 @@ static int create_gpio_led(const struct gpio_led *template,
 
 struct gpio_leds_priv {
 	int num_leds;
-	struct gpio_led_data leds[];
+	struct gpio_led_data leds[] __counted_by(num_leds);
 };
 
 static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] leds: gpio: Annotate struct gpio_leds_priv with __counted_by
  2023-09-15 20:10 [PATCH] leds: gpio: Annotate struct gpio_leds_priv with __counted_by Kees Cook
@ 2023-09-15 20:47 ` Gustavo A. R. Silva
  2023-09-20 13:38 ` (subset) " Lee Jones
  1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:47 UTC (permalink / raw)
  To: Kees Cook, Pavel Machek
  Cc: Lee Jones, linux-leds, Nathan Chancellor, Nick Desaulniers,
	Tom Rix, linux-kernel, llvm, linux-hardening



On 9/15/23 14:10, 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 gpio_leds_priv.
> 
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> 
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Lee Jones <lee@kernel.org>
> Cc: linux-leds@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>

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

Thanks
-- 
Gustavo

> ---
>   drivers/leds/leds-gpio.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
> index 7bfe40a6bfdd..a6597f0f3eb4 100644
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@ -142,7 +142,7 @@ static int create_gpio_led(const struct gpio_led *template,
>   
>   struct gpio_leds_priv {
>   	int num_leds;
> -	struct gpio_led_data leds[];
> +	struct gpio_led_data leds[] __counted_by(num_leds);
>   };
>   
>   static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: (subset) [PATCH] leds: gpio: Annotate struct gpio_leds_priv with __counted_by
  2023-09-15 20:10 [PATCH] leds: gpio: Annotate struct gpio_leds_priv with __counted_by Kees Cook
  2023-09-15 20:47 ` Gustavo A. R. Silva
@ 2023-09-20 13:38 ` Lee Jones
  1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2023-09-20 13:38 UTC (permalink / raw)
  To: Pavel Machek, Kees Cook
  Cc: Lee Jones, linux-leds, Nathan Chancellor, Nick Desaulniers,
	Tom Rix, linux-kernel, llvm, linux-hardening

On Fri, 15 Sep 2023 13:10:04 -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 gpio_leds_priv.
> 
> [...]

Applied, thanks!

[1/1] leds: gpio: Annotate struct gpio_leds_priv with __counted_by
      commit: 00f91ead9c8037d044414ae44a0e75ef3df27e6f

--
Lee Jones [李琼斯]


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-09-20 13:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:10 [PATCH] leds: gpio: Annotate struct gpio_leds_priv with __counted_by Kees Cook
2023-09-15 20:47 ` Gustavo A. R. Silva
2023-09-20 13:38 ` (subset) " Lee Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).