Skip to content

Commit 7aba5dc

Browse files
GustavoARSilvakleikamp
authored andcommitted
jfs: 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] KSPP#21 [3] commit 7649773 ("cxgb3/l2t: Fix undefined behaviour") Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Dave Kleikamp <[email protected]>
1 parent 2c523b3 commit 7aba5dc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fs/jfs/jfs_dtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2964,7 +2964,7 @@ struct jfs_dirent {
29642964
loff_t position;
29652965
int ino;
29662966
u16 name_len;
2967-
char name[0];
2967+
char name[];
29682968
};
29692969

29702970
/*

fs/jfs/jfs_xattr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ struct jfs_ea {
1717
u8 flag; /* Unused? */
1818
u8 namelen; /* Length of name */
1919
__le16 valuelen; /* Length of value */
20-
char name[0]; /* Attribute name (includes null-terminator) */
20+
char name[]; /* Attribute name (includes null-terminator) */
2121
}; /* Value immediately follows name */
2222

2323
struct jfs_ea_list {
2424
__le32 size; /* overall size */
25-
struct jfs_ea ea[0]; /* Variable length list */
25+
struct jfs_ea ea[]; /* Variable length list */
2626
};
2727

2828
/* Macros for defining maxiumum number of bytes supported for EAs */

0 commit comments

Comments
 (0)