Skip to contentSkip to conversation

ACPI: PRM: Annotate struct prm_module_info with __counted_by

PATCH Applied Kees Cook 3 participants 3 messages Sep 22, 2023 – Oct 3, 2023 ACPI

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 ACPI: PRM: Annotate struct prm_module_info 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 prm_module_info.

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

Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>
---
 drivers/acpi/prmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/prmt.c +1 -1
index 7020584096bf..c78453c74ef5 100644
@@ -69,7 +69,7 @@ struct prm_module_info {
 	bool updatable;
 
 	struct list_head module_list;
-	struct prm_handler_info handlers[];
+	struct prm_handler_info handlers[] __counted_by(handler_count);
 };
 
 static u64 efi_pa_va_lookup(u64 pa)
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Kees Cook

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

Quoted 8 lines

As found with Coccinelle[1], add __counted_by for struct prm_module_info.

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

Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>

Thanks

Signature · 1 line
Gustavo
Quoted 17 lines
---
  drivers/acpi/prmt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/prmt.c +1 -1
index 7020584096bf..c78453c74ef5 100644
@@ -69,7 +69,7 @@ struct prm_module_info {
  	bool updatable;
 
  	struct list_head module_list;
-	struct prm_handler_info handlers[];
+	struct prm_handler_info handlers[] __counted_by(handler_count);
  };
 
  static u64 efi_pa_va_lookup(u64 pa)
maintainer Applied
#2 lore raw
Quoted 12 lines · Gustavo A. R. Silva
Quoted 8 lines · Kees Cook

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

Quoted 8 lines
Quoted 6 lines

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

Cc "Rafael J. Wysocki" <[email protected]>
Cc Len Brown <[email protected]>

Applied as 6.7 material, thanks!

Quoted 17 lines
Quoted 17 lines
---
  drivers/acpi/prmt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/prmt.c +1 -1
index 7020584096bf..c78453c74ef5 100644
@@ -69,7 +69,7 @@ struct prm_module_info {
      bool updatable;
 
      struct list_head module_list;
-     struct prm_handler_info handlers[];
+     struct prm_handler_info handlers[] __counted_by(handler_count);
  };
 
  static u64 efi_pa_va_lookup(u64 pa)