From: Kees Cook Date: Fri, 22 Sep 2023 17:28:52 +0000 (-0700) Subject: net: openvswitch: Annotate struct dp_meter_instance with __counted_by X-Git-Tag: v6.7-rc1~160^2~266^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7b34822fa4dcf6101deb3d51a77efd77533571d;p=thirdparty%2Fkernel%2Flinux.git net: openvswitch: Annotate struct dp_meter_instance 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 dp_meter_instance. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Pravin B Shelar Cc: dev@openvswitch.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Link: https://lore.kernel.org/r/20230922172858.3822653-10-keescook@chromium.org Signed-off-by: Jakub Kicinski --- diff --git a/net/openvswitch/meter.h b/net/openvswitch/meter.h index 0c33889a85156..013de694221f8 100644 --- a/net/openvswitch/meter.h +++ b/net/openvswitch/meter.h @@ -45,7 +45,7 @@ struct dp_meter { struct dp_meter_instance { struct rcu_head rcu; u32 n_meters; - struct dp_meter __rcu *dp_meters[]; + struct dp_meter __rcu *dp_meters[] __counted_by(n_meters); }; struct dp_meter_table {