bcachefs: Annotate struct bucket_gens with __counted_by()
PATCH RESEND 1/1 bcachefs: Annotate struct bucket_gens with __counted_by()
Add the __counted_by compiler attribute to the flexible array member b to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE.
Use struct_size() to calculate the number of bytes to be allocated.
Update bucket_gens->nbuckets and bucket_gens->nbuckets_minus_first when resizing.
Compile-tested only.
--- fs/bcachefs/buckets.c | 13 ++++++++----- fs/bcachefs/buckets_types.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-)
fs/bcachefs/buckets.c +8 -5
@@ -1266,8 +1266,9 @@ int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets)BUG_ON (resize && ca->buckets_nouse); -if (!(bucket_gens =kvmalloc (sizeof (struct bucket_gens ) + nbuckets, -GFP_KERNEL |__GFP_ZERO))) { + bucket_gens =kvmalloc (struct_size (bucket_gens, b, nbuckets), +GFP_KERNEL |__GFP_ZERO); +if (!bucket_gens) { ret = -BCH_ERR_ENOMEM_bucket_gens; goto err; }
@@ -1285,11 +1286,13 @@ int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets) old_bucket_gens =rcu_dereference_protected (ca->bucket_gens,1 );if (resize) { -size_t n =min (bucket_gens->nbuckets, old_bucket_gens->nbuckets); - + bucket_gens->nbuckets =min (bucket_gens->nbuckets, + old_bucket_gens->nbuckets); + bucket_gens->nbuckets_minus_first = + bucket_gens->nbuckets - bucket_gens->first_bucket;memcpy (bucket_gens->b, old_bucket_gens->b, - n); + bucket_gens->nbuckets); }rcu_assign_pointer (ca->bucket_gens, bucket_gens);
fs/bcachefs/buckets_types.h +1 -1
@@ -24,7 +24,7 @@ struct bucket_gens {u16 first_bucket;size_t nbuckets;size_t nbuckets_minus_first; -u8 b[]; + u8 b[] __counted_by(nbuckets); };struct bch_dev_usage {
Signature · 1 line
2.47.0
Quoted 4 lines · Thorsten Blum
Add the
__counted_bycompiler attribute to the flexible array member b to improve access bounds-checking viaCONFIG_UBSAN_BOUNDSandCONFIG_FORTIFY_SOURCE.
Quoted 8 lines
Use
struct_size()to calculate the number of bytes to be allocated.Update
bucket_gens->nbucketsandbucket_gens->nbuckets_minus_firstwhen resizing.Compile-tested only.
Signed-off-by Thorsten Blum <[email protected]>
I can take this patch without it being tested, but please have a look at ktest:
https://evilpiepirate.org/git/ktest.git/
that's where all the bcachefs tests live, and it's a nice testing and debugging tool. The CI runs the same tests, and I can give you an account there as well.
Quoted 54 lines
--- fs/bcachefs/buckets.c | 13 ++++++++----- fs/bcachefs/buckets_types.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-)fs/bcachefs/buckets.c +8
-5@@ -1266,8 +1266,9 @@ int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets)BUG_ON (resize && ca->buckets_nouse); -if (!(bucket_gens =kvmalloc (sizeof (struct bucket_gens ) + nbuckets, -GFP_KERNEL |__GFP_ZERO))) { + bucket_gens =kvmalloc (struct_size (bucket_gens, b, nbuckets), +GFP_KERNEL |__GFP_ZERO); +if (!bucket_gens) { ret = -BCH_ERR_ENOMEM_bucket_gens; goto err; }@@ -1285,11 +1286,13 @@ int bch2_dev_buckets_resize(struct bch_fs *c, struct bch_dev *ca, u64 nbuckets) old_bucket_gens =rcu_dereference_protected (ca->bucket_gens,1 );if (resize) { -size_t n =min (bucket_gens->nbuckets, old_bucket_gens->nbuckets); - + bucket_gens->nbuckets =min (bucket_gens->nbuckets, + old_bucket_gens->nbuckets); + bucket_gens->nbuckets_minus_first = + bucket_gens->nbuckets - bucket_gens->first_bucket;memcpy (bucket_gens->b, old_bucket_gens->b, - n); + bucket_gens->nbuckets); }rcu_assign_pointer (ca->bucket_gens, bucket_gens);fs/bcachefs/buckets_types.h +1
-1@@ -24,7 +24,7 @@ struct bucket_gens {u16 first_bucket;size_t nbuckets;size_t nbuckets_minus_first; -u8 b[]; + u8 b[] __counted_by(nbuckets); };struct bch_dev_usage {Signature · 1 line
2.47.0