Skip to content

Commit 75f5f60

Browse files
GustavoARSilvakdave
authored andcommitted
btrfs: add __counted_by for struct btrfs_delayed_item and use struct_size()
Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). While there, use struct_size() helper, instead of the open-coded version, to calculate the size for the allocation of the whole flexible structure, including of course, the flexible-array member. This code was found with the help of Coccinelle, and audited and fixed manually. Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 54f67de commit 75f5f60

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/btrfs/delayed-inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static struct btrfs_delayed_item *btrfs_alloc_delayed_item(u16 data_len,
313313
{
314314
struct btrfs_delayed_item *item;
315315

316-
item = kmalloc(sizeof(*item) + data_len, GFP_NOFS);
316+
item = kmalloc(struct_size(item, data, data_len), GFP_NOFS);
317317
if (item) {
318318
item->data_len = data_len;
319319
item->type = type;

fs/btrfs/delayed-inode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct btrfs_delayed_item {
9595
bool logged;
9696
/* The maximum leaf size is 64K, so u16 is more than enough. */
9797
u16 data_len;
98-
char data[];
98+
char data[] __counted_by(data_len);
9999
};
100100

101101
static inline void btrfs_init_delayed_root(

0 commit comments

Comments
 (0)