bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: add __counted_by for struct btrfs_delayed_item and use struct_size()

Browse source 
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>
This commit is contained in:
Gustavo A. R. Silva 2023-10-09 14:44:54 -06:00 • committed by David Sterba
parent 54f67decdd
commit 75f5f60bf7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/delayed-inode.c
View file

@ -313,7 +313,7 @@ static struct btrfs_delayed_item *btrfs_alloc_delayed_item(u16 data_len,
{ {
struct btrfs_delayed_item *item; struct btrfs_delayed_item *item;
item = kmalloc(sizeof(*item) + data_len, GFP_NOFS); item = kmalloc(struct_size(item, data, data_len), GFP_NOFS);
if (item) { if (item) {
item->data_len = data_len; item->data_len = data_len;
item->type = type; item->type = type;

2
fs/btrfs/delayed-inode.h
View file

@ -95,7 +95,7 @@ struct btrfs_delayed_item {
bool logged; bool logged;
/* The maximum leaf size is 64K, so u16 is more than enough. */ /* The maximum leaf size is 64K, so u16 is more than enough. */
u16 data_len; u16 data_len;
char data[]; char data[] __counted_by(data_len);
}; };
static inline void btrfs_init_delayed_root( static inline void btrfs_init_delayed_root(