vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use actually filled extent size if available

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-11 07:53:21 +02:00
parent 565f076311
commit 6a01f54aff
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
grub-core/fs/btrfs.c
View file

@ -83,6 +83,7 @@ struct grub_btrfs_data
/* Cached extent data. */ /* Cached extent data. */
grub_uint64_t extstart; grub_uint64_t extstart;
grub_uint64_t extend;
grub_uint64_t extino; grub_uint64_t extino;
grub_uint64_t exttree; grub_uint64_t exttree;
grub_size_t extsize; grub_size_t extsize;
@ -202,6 +203,7 @@ struct grub_btrfs_extent_data
grub_uint64_t laddr; grub_uint64_t laddr;
grub_uint64_t compressed_size; grub_uint64_t compressed_size;
grub_uint64_t offset; grub_uint64_t offset;
grub_uint64_t filled;
}; };
}; };
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -872,12 +874,12 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
grub_err_t err; grub_err_t err;
grub_off_t extoff; grub_off_t extoff;
if (!data->extent || data->extstart > pos || data->extino != ino if (!data->extent || data->extstart > pos || data->extino != ino
|| data->exttree != tree || data->exttree != tree || data->extend <= pos)
|| grub_le_to_cpu64 (data->extent->size) + data->extstart <= pos)
{ {
struct grub_btrfs_key key_in, key_out; struct grub_btrfs_key key_in, key_out;
grub_disk_addr_t elemaddr; grub_disk_addr_t elemaddr;
grub_size_t elemsize; grub_size_t elemsize;
grub_free (data->extent); grub_free (data->extent);
key_in.object_id = ino; key_in.object_id = ino;
key_in.type = GRUB_BTRFS_ITEM_TYPE_EXTENT_ITEM; key_in.type = GRUB_BTRFS_ITEM_TYPE_EXTENT_ITEM;
@ -904,15 +906,29 @@ grub_btrfs_extent_read (struct grub_btrfs_data *data,
data->extent, elemsize); data->extent, elemsize);
if (err) if (err)
return err; return err;
if (grub_le_to_cpu64 (data->extent->size) + data->extstart <= pos)
return grub_error (GRUB_ERR_BAD_FS, "extent not found"); data->extend = data->extstart
+ grub_le_to_cpu64 (data->extent->size);
if (data->extent->type == GRUB_BTRFS_EXTENT_REGULAR
&& (char *) &data->extent + elemsize
>= (char *) &data->extent->filled
+ sizeof (data->extent->filled))
data->extend = data->extstart
+ grub_le_to_cpu64 (data->extent->filled);
grub_dprintf ("btrfs", "extent 0x%" PRIxGRUB_UINT64_T "+0x%" grub_dprintf ("btrfs", "extent 0x%" PRIxGRUB_UINT64_T "+0x%"
PRIxGRUB_UINT64_T "\n", PRIxGRUB_UINT64_T " (0x%"
PRIxGRUB_UINT64_T ")\n",
grub_le_to_cpu64 (key_out.offset), grub_le_to_cpu64 (key_out.offset),
grub_le_to_cpu64 (data->extent->size)); grub_le_to_cpu64 (data->extent->size),
grub_le_to_cpu64 (data->extent->filled));
if (data->extend <= pos)
{
grub_error (GRUB_ERR_BAD_FS, "extent not found");
return -1;
}
} }
csize = grub_le_to_cpu64 (data->extent->size) csize = data->extend - pos;
+ grub_le_to_cpu64 (data->extstart) - pos;
extoff = pos - data->extstart; extoff = pos - data->extstart;
if (csize > len) if (csize > len)
csize = len; csize = len;