Skip to content

Commit

Permalink
jfs: 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] KSPP/linux#21
[3] commit 7649773 ("cxgb3/l2t: Fix undefined behaviour")

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
  • Loading branch information
GustavoARSilva authored and kleikamp committed Mar 9, 2020
1 parent 2c523b3 commit 7aba5dc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fs/jfs/jfs_dtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -2964,7 +2964,7 @@ struct jfs_dirent {
loff_t position;
int ino;
u16 name_len;
char name[0];
char name[];
};

/*
Expand Down
4 changes: 2 additions & 2 deletions fs/jfs/jfs_xattr.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ struct jfs_ea {
u8 flag; /* Unused? */
u8 namelen; /* Length of name */
__le16 valuelen; /* Length of value */
char name[0]; /* Attribute name (includes null-terminator) */
char name[]; /* Attribute name (includes null-terminator) */
}; /* Value immediately follows name */

struct jfs_ea_list {
__le32 size; /* overall size */
struct jfs_ea ea[0]; /* Variable length list */
struct jfs_ea ea[]; /* Variable length list */
};

/* Macros for defining maxiumum number of bytes supported for EAs */
Expand Down

0 comments on commit 7aba5dc

Please sign in to comment.