diff options
| author | David Sterba <dsterba@suse.com> | 2019-03-29 02:07:02 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-03-23 17:01:44 +0100 |
| commit | ee787f9550534612a4694cc4ec9f2d397d4b5752 (patch) | |
| tree | 240e8387a5bc65dc5236e686e8a5893b6e95e0f5 /fs/btrfs/raid56.c | |
| parent | dcc3eb9638c3c927f1597075e851d0a16300a876 (diff) | |
| download | linux-stable-ee787f9550534612a4694cc4ec9f2d397d4b5752.tar.gz linux-stable-ee787f9550534612a4694cc4ec9f2d397d4b5752.tar.bz2 linux-stable-ee787f9550534612a4694cc4ec9f2d397d4b5752.zip | |
btrfs: use struct_size to calculate size of raid hash table
The struct_size macro does the same calculation and is safe regarding
overflows. Though we're not expecting them to happen, use the helper for
clarity.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/raid56.c')
| -rw-r--r-- | fs/btrfs/raid56.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 406b1efd3ba5..c870ef70f817 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -206,7 +206,6 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info) struct btrfs_stripe_hash *h; int num_entries = 1 << BTRFS_STRIPE_HASH_TABLE_BITS; int i; - int table_size; if (info->stripe_hash_table) return 0; @@ -218,8 +217,7 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info) * Try harder to allocate and fallback to vmalloc to lower the chance * of a failing mount. */ - table_size = sizeof(*table) + sizeof(*h) * num_entries; - table = kvzalloc(table_size, GFP_KERNEL); + table = kvzalloc(struct_size(table, table, num_entries), GFP_KERNEL); if (!table) return -ENOMEM; |