btrfs: Add __counted_by for struct btrfs_delayed_item and use struct_size()
PATCH 1/1 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.
--- fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/delayed-inode.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/delayed-inode.c +1 -1
@@ -313,7 +313,7 @@ static struct btrfs_delayed_item *btrfs_alloc_delayed_item(u16 data_len, {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) { item->data_len = data_len; item->type = type;
fs/btrfs/delayed-inode.h +1 -1
@@ -95,7 +95,7 @@ struct btrfs_delayed_item {bool logged;/* The maximum leaf size is 64K, so u16 is more than enough. */ u16 data_len; -char data[]; + char data[] __counted_by(data_len); }; static inline void btrfs_init_delayed_root(
Signature · 1 line
2.34.1
Quoted 6 lines · Gustavo A. R. Silva
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 8 lines
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.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Looks right to me.
Signature · 1 line
Kees Cook
Quoted 6 lines · Gustavo A. R. Silva
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).
Quoted 8 lines
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.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Added to misc-next, thanks.