bcachefs: Add missing accounting key type validation
PATCH 1/1 bcachefs: Add missing accounting key type validation
Reported-by [email protected]
Signed-off-by Alan Huang <[email protected]>
--- fs/bcachefs/disk_accounting.c | 5 +++++ fs/bcachefs/sb-errors_format.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
fs/bcachefs/disk_accounting.c +5 -0
@@ -184,6 +184,11 @@ int bch2_accounting_validate(struct bch_fs *c, struct bkey_s_c k,void *end = &acc_k +1 ;int ret =0 ; +bkey_fsck_err_on (acc_k.type >=BCH_DISK_ACCOUNTING_TYPE_NR , + c, accounting_key_type_invalid, +"invalid accounting type (%u >= %u)" , + acc_k.type,BCH_DISK_ACCOUNTING_TYPE_NR ); + bkey_fsck_err_on((from.flags & BCH_VALIDATE_commit) && bversion_zero(k.k->bversion), c, accounting_key_version_0,
fs/bcachefs/sb-errors_format.h +2 -1
@@ -328,6 +328,7 @@ enum bch_fsck_flags { x(accounting_key_replicas_devs_unsorted, 280, FSCK_AUTOFIX) \ x(accounting_key_version_0, 282, FSCK_AUTOFIX) \ x(accounting_key_nr_counters_wrong, 307, FSCK_AUTOFIX) \ + x(accounting_key_type_invalid, 325, FSCK_AUTOFIX) \ x(logged_op_but_clean, 283, FSCK_AUTOFIX) \ x(compression_opt_not_marked_in_sb, 295, FSCK_AUTOFIX) \x (compression_type_not_marked_in_sb,296 ,FSCK_AUTOFIX ) \
@@ -336,7 +337,7 @@ enum bch_fsck_flags { x(dirent_stray_data_after_cf_name, 305, 0) \ x(rebalance_work_incorrectly_set, 309, FSCK_AUTOFIX) \ x(rebalance_work_incorrectly_unset, 310, FSCK_AUTOFIX) \ - x(MAX, 325, 0) + x(MAX, 326, 0)enum bch_sb_error_id {#define x(t, n, ...) BCH_FSCK_ERR_##t = n,
Signature · 1 line
2.49.0
Quoted 12 lines · Alan Huang
Reported-by [email protected]Signed-off-by Alan Huang <[email protected]>--- fs/bcachefs/disk_accounting.c | 5 +++++ fs/bcachefs/sb-errors_format.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)fs/bcachefs/disk_accounting.c +0
-0
fs/bcachefs/disk_accounting.c int bch2_accounting_validate(struct bch_fs *c, struct bkey_s_c k, · line 191
Quoted 8 lines
fs/bcachefs/disk_accounting.c +5
-0@@ -184,6 +184,11 @@ int bch2_accounting_validate(struct bch_fs *c, struct bkey_s_c k,void *end = &acc_k +1 ;int ret =0 ; +bkey_fsck_err_on (acc_k.type >=BCH_DISK_ACCOUNTING_TYPE_NR , + c, accounting_key_type_invalid, +"invalid accounting type (%u >= %u)" , + acc_k.type,BCH_DISK_ACCOUNTING_TYPE_NR ); +
No, this isn't a validate error - this breaks forwards compatibility.
Other code paths just need to silently ignore unknown accounting types.
Quoted 27 lines
fs/bcachefs/disk_accounting.c +0
-0bkey_fsck_err_on((from.flags & BCH_VALIDATE_commit) && bversion_zero(k.k->bversion), c, accounting_key_version_0,fs/bcachefs/sb-errors_format.h +2
-1@@ -328,6 +328,7 @@ enum bch_fsck_flags { x(accounting_key_replicas_devs_unsorted, 280, FSCK_AUTOFIX) \ x(accounting_key_version_0, 282, FSCK_AUTOFIX) \ x(accounting_key_nr_counters_wrong, 307, FSCK_AUTOFIX) \ + x(accounting_key_type_invalid, 325, FSCK_AUTOFIX) \ x(logged_op_but_clean, 283, FSCK_AUTOFIX) \ x(compression_opt_not_marked_in_sb, 295, FSCK_AUTOFIX) \x (compression_type_not_marked_in_sb,296 ,FSCK_AUTOFIX ) \@@ -336,7 +337,7 @@ enum bch_fsck_flags { x(dirent_stray_data_after_cf_name, 305, 0) \ x(rebalance_work_incorrectly_set, 309, FSCK_AUTOFIX) \ x(rebalance_work_incorrectly_unset, 310, FSCK_AUTOFIX) \ - x(MAX, 325, 0) + x(MAX, 326, 0)enum bch_sb_error_id {#define x(t, n, ...) BCH_FSCK_ERR_##t = n,Signature · 1 line
2.49.0