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

* include/grub/partition.h (grub_partition_map): Change prototype of

Browse source 
embed to take a maximum value for nsectors.
	* include/grub/emu/hostdisk.h (grub_util_ldm_embed): Likewise.
	* include/grub/fs.h (grub_fs): Likewise.
	* grub-core/partmap/msdos.c (embed_signatures): New array.
	(pc_partition_map_embed): Check for and avoid sectors matching any
	of the signatures in embed_signatures, up to max_nsectors.
	* grub-core/partmap/gpt.c (gpt_partition_map_embed): Restrict
	returned sector map to max_nsectors.
	* grub-core/disk/ldm.c (grub_util_ldm_embed): Likewise.
	* grub-core/fs/btrfs.c (grub_btrfs_embed): Likewise.
	* grub-core/fs/zfs/zfs.c (grub_zfs_embed): Likewise.
	* util/grub-setup.c (setup): Allow for the embedding area being
	split into multiple blocklists.  Tell dest_partmap->embed the
	maximum number of sectors we care about.
This commit is contained in:
Colin Watson 2012-02-27 22:25:39 +01:00 • committed by Vladimir 'phcoder' Serbinenko
commit e3c78337c3
10 changed files with 175 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
grub-core/disk/ldm.c
View file

@ -909,6 +909,7 @@ grub_util_is_ldm (grub_disk_t disk)
grub_err_t
grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
unsigned int max_nsectors,
grub_embed_type_t embed_type,
grub_disk_addr_t **sectors)
{
@ -967,6 +968,8 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
N_("your LDM embedding Partition is too small;"
" embedding won't be possible"));
*nsectors = lv->size;
if (*nsectors > max_nsectors)
*nsectors = max_nsectors;
*sectors = grub_malloc (*nsectors * sizeof (**sectors));
if (!*sectors)
return grub_errno;