fa1ab1b466
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>
36 lines
870 B
C
36 lines
870 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _BCACHEFS_REPLICAS_FORMAT_H
|
|
#define _BCACHEFS_REPLICAS_FORMAT_H
|
|
|
|
struct bch_replicas_entry_v0 {
|
|
__u8 data_type;
|
|
__u8 nr_devs;
|
|
__u8 devs[] __counted_by(nr_devs);
|
|
} __packed;
|
|
|
|
struct bch_sb_field_replicas_v0 {
|
|
struct bch_sb_field field;
|
|
struct bch_replicas_entry_v0 entries[];
|
|
} __packed __aligned(8);
|
|
|
|
struct bch_replicas_entry_v1 {
|
|
__u8 data_type;
|
|
__u8 nr_devs;
|
|
__u8 nr_required;
|
|
__u8 devs[] __counted_by(nr_devs);
|
|
} __packed;
|
|
|
|
struct bch_sb_field_replicas {
|
|
struct bch_sb_field field;
|
|
struct bch_replicas_entry_v1 entries[];
|
|
} __packed __aligned(8);
|
|
|
|
#define replicas_entry_bytes(_i) \
|
|
(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 */
|