diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-03-08 14:53:03 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-03-10 15:21:04 -0400 |
| commit | 94817db95681155437100d9f25b3e1390fff8ad6 (patch) | |
| tree | 82d95c33b56716444180b897232d3f0932f4523b /fs/bcachefs/bkey.h | |
| parent | b3eba6a4a7e3e148abfde7a30daa855839fcc043 (diff) | |
bcachefs: Correctly validate k->u64s in btree node read path
validate_bset_keys() never properly validated k->u64s; it checked if it
was 0, but not if it was smaller than keys for the given packed format;
this fixes that small oversight.
This patch was backported, so it's adding quite a few error enums so
that they don't get renumbered and we don't have confusing gaps.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/bkey.h')
| -rw-r--r-- | fs/bcachefs/bkey.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/bcachefs/bkey.h b/fs/bcachefs/bkey.h index 831be01809f2..2a8b8fef539c 100644 --- a/fs/bcachefs/bkey.h +++ b/fs/bcachefs/bkey.h @@ -362,10 +362,7 @@ static inline struct bpos bkey_start_pos(const struct bkey *k) static inline unsigned bkeyp_key_u64s(const struct bkey_format *format, const struct bkey_packed *k) { - unsigned ret = bkey_packed(k) ? format->key_u64s : BKEY_U64s; - - EBUG_ON(k->u64s < ret); - return ret; + return bkey_packed(k) ? format->key_u64s : BKEY_U64s; } static inline unsigned bkeyp_key_bytes(const struct bkey_format *format, |