Skip to content

Commit 10cfde5

Browse files
GustavoARSilvarafaeljw
authored andcommitted
ACPICA: Replace one-element array with flexible-array
ACPICA commit 7ba2f3d91a32f104765961fda0ed78b884ae193d The current codebase makes use of one-element arrays in the following form: struct something { int length; u8 data[1]; }; struct something *instance; instance = kmalloc(sizeof(*instance) + size, GFP_KERNEL); instance->length = size; memcpy(instance->data, source, size); but the preferred mechanism to declare variable-length types such as these ones is a flexible array member[1][2], introduced in C99: struct foo { int stuff; struct boo array[]; }; By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being inadvertently introduced[3] to the linux codebase from now on. This issue was found with the help of Coccinelle and audited _manually_. [1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html [2] KSPP#21 [3] commit 7649773 ("cxgb3/l2t: Fix undefined behaviour") Link: acpica/acpica@7ba2f3d9 Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Erik Kaneda <[email protected]> Signed-off-by: Bob Moore <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 92ed301 commit 10cfde5

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

drivers/acpi/acpica/utids.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
263263
* 3) Size of the actual CID strings
264264
*/
265265
cid_list_size = sizeof(struct acpi_pnp_device_id_list) +
266-
((count - 1) * sizeof(struct acpi_pnp_device_id)) +
267-
string_area_size;
266+
(count * sizeof(struct acpi_pnp_device_id)) + string_area_size;
268267

269268
cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
270269
if (!cid_list) {

include/acpi/actypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ struct acpi_pnp_device_id {
11461146
struct acpi_pnp_device_id_list {
11471147
u32 count; /* Number of IDs in Ids array */
11481148
u32 list_size; /* Size of list, including ID strings */
1149-
struct acpi_pnp_device_id ids[1]; /* ID array */
1149+
struct acpi_pnp_device_id ids[]; /* ID array */
11501150
};
11511151

11521152
/*

0 commit comments

Comments
 (0)