Skip to content

Commit

Permalink
net: dccp: Replace zero-length array with flexible-array member
Browse files Browse the repository at this point in the history
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 7649773 ("cxgb3/l2t: Fix undefined behaviour")

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Gustavo A. R. Silva authored and David S. Miller committed Feb 28, 2020
1 parent af71b09 commit 8402a31
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/linux/dccp.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ enum dccp_role {

struct dccp_service_list {
__u32 dccpsl_nr;
__be32 dccpsl_list[0];
__be32 dccpsl_list[];
};

#define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)
Expand Down
2 changes: 1 addition & 1 deletion net/dccp/ccid.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void ccid_cleanup_builtins(void);

struct ccid {
struct ccid_operations *ccid_ops;
char ccid_priv[0];
char ccid_priv[];
};

static inline void *ccid_priv(const struct ccid *ccid)
Expand Down

0 comments on commit 8402a31

Please sign in to comment.