Skip to content

Commit 8ac7571

Browse files
GustavoARSilvaPeter Zijlstra
authored andcommitted
perf/x86: Replace zero-length array with flexible-array
The current codebase makes use of the zero-length array language extension to the C90 standard, 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 codebase from now on. Also, notice that, dynamic memory allocations won't be affected by this change: "Flexible array members have incomplete type, and so the sizeof operator may not be applied. As a quirk of the original implementation of zero-length arrays, sizeof evaluates to zero."[1] sizeof(flexible-array-member) triggers a warning because flexible array members have incomplete type[1]. There are some instances of code in which the sizeof operator is being incorrectly/erroneously applied to zero-length arrays and the result is zero. Such instances may be hiding some bugs. So, this work (flexible-array member conversions) will also help to get completely rid of those sorts of issues. This issue was found with the help of Coccinelle. [1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html [2] KSPP#21 [3] commit 7649773 ("cxgb3/l2t: Fix undefined behaviour") Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/20200511200911.GA13149@embeddedor
1 parent 0813c40 commit 8ac7571

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/events/intel/bts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct bts_buffer {
5858
local_t head;
5959
unsigned long end;
6060
void **data_pages;
61-
struct bts_phys buf[0];
61+
struct bts_phys buf[];
6262
};
6363

6464
static struct pmu bts_pmu;

arch/x86/events/intel/uncore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ struct intel_uncore_box {
130130
struct list_head list;
131131
struct list_head active_list;
132132
void __iomem *io_addr;
133-
struct intel_uncore_extra_reg shared_regs[0];
133+
struct intel_uncore_extra_reg shared_regs[];
134134
};
135135

136136
/* CFL uncore 8th cbox MSRs */

0 commit comments

Comments
 (0)