Skip to content

Commit c50c75e

Browse files
GustavoARSilvaPeter Zijlstra
authored andcommitted
perf/core: 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/20200511201227.GA14041@embeddedor
1 parent 8ac7571 commit c50c75e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

include/linux/perf_event.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct perf_guest_info_callbacks {
6161

6262
struct perf_callchain_entry {
6363
__u64 nr;
64-
__u64 ip[0]; /* /proc/sys/kernel/perf_event_max_stack */
64+
__u64 ip[]; /* /proc/sys/kernel/perf_event_max_stack */
6565
};
6666

6767
struct perf_callchain_entry_ctx {
@@ -113,7 +113,7 @@ struct perf_raw_record {
113113
struct perf_branch_stack {
114114
__u64 nr;
115115
__u64 hw_idx;
116-
struct perf_branch_entry entries[0];
116+
struct perf_branch_entry entries[];
117117
};
118118

119119
struct task_struct;

kernel/events/callchain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
struct callchain_cpus_entries {
1818
struct rcu_head rcu_head;
19-
struct perf_callchain_entry *cpu_entries[0];
19+
struct perf_callchain_entry *cpu_entries[];
2020
};
2121

2222
int sysctl_perf_event_max_stack __read_mostly = PERF_MAX_STACK_DEPTH;

kernel/events/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct perf_buffer {
5555
void *aux_priv;
5656

5757
struct perf_event_mmap_page *user_page;
58-
void *data_pages[0];
58+
void *data_pages[];
5959
};
6060

6161
extern void rb_free(struct perf_buffer *rb);

0 commit comments

Comments
 (0)