Skip to content

Commit ea1d1ca

Browse files
Damenlykdave
authored andcommitted
btrfs: tree-checker: check item_size for dev_item
Check item size before accessing the device item to avoid out of bound access, similar to inode_item check. Signed-off-by: Su Yue <l@damenly.su> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 0c98294 commit ea1d1ca

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

fs/btrfs/tree-checker.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -965,13 +965,21 @@ static int check_dev_item(struct extent_buffer *leaf,
965965
struct btrfs_key *key, int slot)
966966
{
967967
struct btrfs_dev_item *ditem;
968+
const u32 item_size = btrfs_item_size(leaf, slot);
968969

969970
if (unlikely(key->objectid != BTRFS_DEV_ITEMS_OBJECTID)) {
970971
dev_item_err(leaf, slot,
971972
"invalid objectid: has=%llu expect=%llu",
972973
key->objectid, BTRFS_DEV_ITEMS_OBJECTID);
973974
return -EUCLEAN;
974975
}
976+
977+
if (unlikely(item_size != sizeof(*ditem))) {
978+
dev_item_err(leaf, slot, "invalid item size: has %u expect %zu",
979+
item_size, sizeof(*ditem));
980+
return -EUCLEAN;
981+
}
982+
975983
ditem = btrfs_item_ptr(leaf, slot, struct btrfs_dev_item);
976984
if (unlikely(btrfs_device_id(leaf, ditem) != key->offset)) {
977985
dev_item_err(leaf, slot,

0 commit comments

Comments
 (0)