Skip to content

Commit fed2ef7

Browse files
committed
reset: Annotate struct reset_control_array 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 reset_control_array. 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 Cc: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org> Link: https://lore.kernel.org/r/20230922175229.work.838-kees@kernel.org Signed-off-by: Kees Cook <keescook@chromium.org>
1 parent 15fcedd commit fed2ef7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/reset/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct reset_control {
6060
struct reset_control_array {
6161
struct reset_control base;
6262
unsigned int num_rstcs;
63-
struct reset_control *rstc[];
63+
struct reset_control *rstc[] __counted_by(num_rstcs);
6464
};
6565

6666
static const char *rcdev_name(struct reset_controller_dev *rcdev)
@@ -1185,6 +1185,7 @@ of_reset_control_array_get(struct device_node *np, bool shared, bool optional,
11851185
resets = kzalloc(struct_size(resets, rstc, num), GFP_KERNEL);
11861186
if (!resets)
11871187
return ERR_PTR(-ENOMEM);
1188+
resets->num_rstcs = num;
11881189

11891190
for (i = 0; i < num; i++) {
11901191
rstc = __of_reset_control_get(np, NULL, i, shared, optional,
@@ -1193,7 +1194,6 @@ of_reset_control_array_get(struct device_node *np, bool shared, bool optional,
11931194
goto err_rst;
11941195
resets->rstc[i] = rstc;
11951196
}
1196-
resets->num_rstcs = num;
11971197
resets->base.array = true;
11981198

11991199
return &resets->base;

0 commit comments

Comments
 (0)