Commit d7f10df8 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Daniel Borkmann

bpf: Replace zero-length array with flexible-array member

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]

This issue was found with the help of Coccinelle.

[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit 76497732 ("cxgb3/l2t: Fix undefined behaviour")
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20200227001744.GA3317@embeddedor
parent 4bc98846
...@@ -36,7 +36,7 @@ struct bpf_cgroup_storage_map; ...@@ -36,7 +36,7 @@ struct bpf_cgroup_storage_map;
struct bpf_storage_buffer { struct bpf_storage_buffer {
struct rcu_head rcu; struct rcu_head rcu;
char data[0]; char data[];
}; };
struct bpf_cgroup_storage { struct bpf_cgroup_storage {
......
...@@ -859,7 +859,7 @@ struct bpf_prog_array_item { ...@@ -859,7 +859,7 @@ struct bpf_prog_array_item {
struct bpf_prog_array { struct bpf_prog_array {
struct rcu_head rcu; struct rcu_head rcu;
struct bpf_prog_array_item items[0]; struct bpf_prog_array_item items[];
}; };
struct bpf_prog_array *bpf_prog_array_alloc(u32 prog_cnt, gfp_t flags); struct bpf_prog_array *bpf_prog_array_alloc(u32 prog_cnt, gfp_t flags);
......
...@@ -73,7 +73,7 @@ struct bpf_insn { ...@@ -73,7 +73,7 @@ struct bpf_insn {
/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */ /* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
struct bpf_lpm_trie_key { struct bpf_lpm_trie_key {
__u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */ __u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */
__u8 data[0]; /* Arbitrary size */ __u8 data[]; /* Arbitrary size */
}; };
struct bpf_cgroup_storage_key { struct bpf_cgroup_storage_key {
......
...@@ -23,7 +23,7 @@ enum bpf_struct_ops_state { ...@@ -23,7 +23,7 @@ enum bpf_struct_ops_state {
struct bpf_struct_ops_value { struct bpf_struct_ops_value {
BPF_STRUCT_OPS_COMMON_VALUE; BPF_STRUCT_OPS_COMMON_VALUE;
char data[0] ____cacheline_aligned_in_smp; char data[] ____cacheline_aligned_in_smp;
}; };
struct bpf_struct_ops_map { struct bpf_struct_ops_map {
......
...@@ -118,7 +118,7 @@ struct htab_elem { ...@@ -118,7 +118,7 @@ struct htab_elem {
struct bpf_lru_node lru_node; struct bpf_lru_node lru_node;
}; };
u32 hash; u32 hash;
char key[0] __aligned(8); char key[] __aligned(8);
}; };
static inline bool htab_is_prealloc(const struct bpf_htab *htab) static inline bool htab_is_prealloc(const struct bpf_htab *htab)
......
...@@ -25,7 +25,7 @@ struct lpm_trie_node { ...@@ -25,7 +25,7 @@ struct lpm_trie_node {
struct lpm_trie_node __rcu *child[2]; struct lpm_trie_node __rcu *child[2];
u32 prefixlen; u32 prefixlen;
u32 flags; u32 flags;
u8 data[0]; u8 data[];
}; };
struct lpm_trie { struct lpm_trie {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment