kevin/linux
1
Fork 0
Code

bcachefs: Annotate bch_replicas_entry_{v0,v1} with __counted_by()

Browse Source 
Add the __counted_by compiler attribute to the flexible array members
devs to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.

Increment nr_devs before adding a new device to the devs array and
adjust the array indexes accordingly. Add a helper macro for adding a
new device.

In bch2_journal_read(), explicitly set nr_devs to 0.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Thorsten Blum 2024-08-26 12:11:36 +02:00 committed by Kent Overstreet
parent c24adfa0df
commit fa1ab1b466
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/bcachefs/buckets.c
View File

@ -741,7 +741,7 @@ static int __trigger_extent(struct btree_trans *trans,
return ret; return ret;
} else if (!p.has_ec) { } else if (!p.has_ec) {
*replicas_sectors += disk_sectors; *replicas_sectors += disk_sectors;
acc_replicas_key.replicas.devs[acc_replicas_key.replicas.nr_devs++] = p.ptr.dev; replicas_entry_add_dev(&acc_replicas_key.replicas, p.ptr.dev);
} else { } else {
ret = bch2_trigger_stripe_ptr(trans, k, p, data_type, disk_sectors, flags); ret = bch2_trigger_stripe_ptr(trans, k, p, data_type, disk_sectors, flags);
if (ret) if (ret)

3
fs/bcachefs/journal_io.c
View File

@ -1353,6 +1353,7 @@ int bch2_journal_read(struct bch_fs *c,
genradix_for_each(&c->journal_entries, radix_iter, _i) { genradix_for_each(&c->journal_entries, radix_iter, _i) {
struct bch_replicas_padded replicas = { struct bch_replicas_padded replicas = {
.e.data_type = BCH_DATA_journal, .e.data_type = BCH_DATA_journal,
.e.nr_devs = 0,
.e.nr_required = 1, .e.nr_required = 1,
}; };
@ -1379,7 +1380,7 @@ int bch2_journal_read(struct bch_fs *c,
goto err; goto err;
darray_for_each(i->ptrs, ptr) darray_for_each(i->ptrs, ptr)
replicas.e.devs[replicas.e.nr_devs++] = ptr->dev; replicas_entry_add_dev(&replicas.e, ptr->dev);
bch2_replicas_entry_sort(&replicas.e); bch2_replicas_entry_sort(&replicas.e);

6
fs/bcachefs/replicas.c
View File

@ -123,7 +123,7 @@ static void extent_to_replicas(struct bkey_s_c k,
continue; continue;
if (!p.has_ec) if (!p.has_ec)
r->devs[r->nr_devs++] = p.ptr.dev; replicas_entry_add_dev(r, p.ptr.dev);
else else
r->nr_required = 0; r->nr_required = 0;
} }
@ -140,7 +140,7 @@ static void stripe_to_replicas(struct bkey_s_c k,
for (ptr = s.v->ptrs; for (ptr = s.v->ptrs;
ptr < s.v->ptrs + s.v->nr_blocks; ptr < s.v->ptrs + s.v->nr_blocks;
ptr++) ptr++)
r->devs[r->nr_devs++] = ptr->dev; replicas_entry_add_dev(r, ptr->dev);
} }
void bch2_bkey_to_replicas(struct bch_replicas_entry_v1 *e, void bch2_bkey_to_replicas(struct bch_replicas_entry_v1 *e,
@ -181,7 +181,7 @@ void bch2_devlist_to_replicas(struct bch_replicas_entry_v1 *e,
e->nr_required = 1; e->nr_required = 1;
darray_for_each(devs, i) darray_for_each(devs, i)
e->devs[e->nr_devs++] = *i; replicas_entry_add_dev(e, *i);
bch2_replicas_entry_sort(e); bch2_replicas_entry_sort(e);
} }

9
fs/bcachefs/replicas_format.h
View File

@ -5,7 +5,7 @@
struct bch_replicas_entry_v0 { struct bch_replicas_entry_v0 {
__u8 data_type; __u8 data_type;
__u8 nr_devs; __u8 nr_devs;
__u8 devs[]; __u8 devs[] __counted_by(nr_devs);
} __packed; } __packed;
struct bch_sb_field_replicas_v0 { struct bch_sb_field_replicas_v0 {
@ -17,7 +17,7 @@ struct bch_replicas_entry_v1 {
__u8 data_type; __u8 data_type;
__u8 nr_devs; __u8 nr_devs;
__u8 nr_required; __u8 nr_required;
__u8 devs[]; __u8 devs[] __counted_by(nr_devs);
} __packed; } __packed;
struct bch_sb_field_replicas { struct bch_sb_field_replicas {
@ -28,4 +28,9 @@ struct bch_sb_field_replicas {
#define replicas_entry_bytes(_i) \ #define replicas_entry_bytes(_i) \
(offsetof(typeof(*(_i)), devs) + (_i)->nr_devs) (offsetof(typeof(*(_i)), devs) + (_i)->nr_devs)
#define replicas_entry_add_dev(e, d) ({ \
(e)->nr_devs++; \
(e)->devs[(e)->nr_devs - 1] = (d); \
})
#endif /* _BCACHEFS_REPLICAS_FORMAT_H */ #endif /* _BCACHEFS_REPLICAS_FORMAT_H */