diff options
| author |  Gustavo A. R. Silva <gustavoars@kernel.org>
| 2023-06-21 16:43:54 -0600 |
|---|---|---|
| committer | Gustavo A. R. Silva <gustavoars@kernel.org>
| 2023-07-12 13:09:46 -0600 |
| commit | 76d2ceda723c90ad7ee93224b8ebaeeb4ea13203 (patch) | |
| tree | 04fb69aa3f6675a769bcb8098426502fb93fde6f /fs/reiserfs | |
| parent | Linux 6.5-rc1 (diff) | |
| download | linux-76d2ceda723c90ad7ee93224b8ebaeeb4ea13203.tar.gz linux-76d2ceda723c90ad7ee93224b8ebaeeb4ea13203.tar.bz2 linux-76d2ceda723c90ad7ee93224b8ebaeeb4ea13203.zip | |
reiserfs: Replace one-element array with flexible-array member
One-element arrays are deprecated, and we are replacing them with flexible
array members instead. So, replace one-element array with flexible-array
member in direntry_uarea structure, and refactor the rest of the code,
accordingly.
Worth mentioning is that before these changes, the original implementation
was returning two-too many bytes in function direntry_create_vi():
fs/reiserfs/item_ops.c:464: int size = sizeof(struct direntry_uarea);
...
fs/reiserfs/item_ops.c-490- size += (dir_u->entry_count * sizeof(short));
...
fs/reiserfs/item_ops.c-517- return size;
Link: https://github.com/KSPP/linux/issues/79
Link: https://github.com/KSPP/linux/issues/290
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/fix_node.c | 5 | ||||
| -rw-r--r-- | fs/reiserfs/reiserfs.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/reiserfs/fix_node.c b/fs/reiserfs/fix_node.c index fefe87e1c099..6c13a8d9a73c 100644 --- a/fs/reiserfs/fix_node.c +++ b/fs/reiserfs/fix_node.c @@ -2252,8 +2252,9 @@ static int get_virtual_node_size(struct super_block *sb, struct buffer_head *bh) return sizeof(struct virtual_node) + max(max_num_of_items * sizeof(struct virtual_item), - sizeof(struct virtual_item) + sizeof(struct direntry_uarea) + - (max_num_of_entries - 1) * sizeof(__u16)); + sizeof(struct virtual_item) + + struct_size_t(struct direntry_uarea, entry_sizes, + max_num_of_entries)); } /* diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h index 55e85256aae8..b81749492ef9 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -2373,7 +2373,7 @@ struct virtual_node { struct direntry_uarea { int flags; __u16 entry_count; - __u16 entry_sizes[1]; + __u16 entry_sizes[]; } __attribute__ ((__packed__)); /*************************************************************************** |