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

* grub-core/disk/diskfilter.c (insert_array): Choose the smallest

Browse source 
device.
	* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Reject too
	small devices.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-27 00:46:08 +01:00
parent 036985b8ce
commit 1e9a9a3faf
3 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-02-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (insert_array): Choose the smallest
device.
* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Reject too
small devices.
2012-02-26 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-26 Vladimir Serbinenko <phcoder@gmail.com>
Remove grub_{modname}_init and grub_{modname}_fini. They should never Remove grub_{modname}_init and grub_{modname}_fini. They should never

44
grub-core/disk/diskfilter.c
View file

@ -966,33 +966,33 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
struct grub_diskfilter_lv *lv; struct grub_diskfilter_lv *lv;
/* FIXME: Check whether the update time of the superblocks are /* FIXME: Check whether the update time of the superblocks are
the same. */ the same. */
if (pv->disk && grub_disk_get_size (disk) >= pv->part_size)
return GRUB_ERR_NONE;
pv->disk = grub_disk_open (disk->name);
if (!pv->disk)
return grub_errno;
/* This could happen to LVM on RAID, pv->disk points to the /* This could happen to LVM on RAID, pv->disk points to the
raid device, we shouldn't change it. */ raid device, we shouldn't change it. */
if (! pv->disk) pv->start_sector -= pv->part_start;
{ pv->part_start = grub_partition_get_start (disk->partition);
pv->disk = grub_disk_open (disk->name); pv->part_size = grub_disk_get_size (disk);
if (! pv->disk)
return grub_errno;
pv->part_start = grub_partition_get_start (disk->partition);
pv->part_size = grub_disk_get_size (disk);
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
{ {
grub_size_t s = 1; grub_size_t s = 1;
grub_partition_t p; grub_partition_t p;
for (p = disk->partition; p; p = p->parent) for (p = disk->partition; p; p = p->parent)
s++; s++;
pv->partmaps = xmalloc (s * sizeof (pv->partmaps[0])); pv->partmaps = xmalloc (s * sizeof (pv->partmaps[0]));
s = 0; s = 0;
for (p = disk->partition; p; p = p->parent) for (p = disk->partition; p; p = p->parent)
pv->partmaps[s++] = xstrdup (p->partmap->name); pv->partmaps[s++] = xstrdup (p->partmap->name);
pv->partmaps[s++] = 0; pv->partmaps[s++] = 0;
} }
#endif #endif
if (start_sector != (grub_uint64_t)-1) if (start_sector != (grub_uint64_t)-1)
pv->start_sector = start_sector; pv->start_sector = start_sector;
pv->start_sector += pv->part_start; pv->start_sector += pv->part_start;
}
/* Add the device to the array. */ /* Add the device to the array. */
for (lv = array->lvs; lv; lv = lv->next) for (lv = array->lvs; lv; lv = lv->next)
if (!lv->became_readable_at && lv->fullname && is_lv_readable (lv)) if (!lv->became_readable_at && lv->fullname && is_lv_readable (lv))

8
grub-core/disk/mdraid_linux.c
View file

@ -192,6 +192,11 @@ grub_mdraid_detect (grub_disk_t disk,
/* Unsupported version. */ /* Unsupported version. */
return NULL; return NULL;
/* No need for explicit check that sb.size is 0 (unspecified) since
0 >= non-0 is false. */
if (((grub_disk_addr_t) grub_le_to_cpu32 (sb.size)) * 2 >= size)
return NULL;
/* FIXME: Check the checksum. */ /* FIXME: Check the checksum. */
level = grub_le_to_cpu32 (sb.level); level = grub_le_to_cpu32 (sb.level);
@ -229,7 +234,8 @@ grub_mdraid_detect (grub_disk_t disk,
grub_snprintf (buf, sizeof (buf), "md%d", grub_le_to_cpu32 (sb.md_minor)); grub_snprintf (buf, sizeof (buf), "md%d", grub_le_to_cpu32 (sb.md_minor));
return grub_diskfilter_make_raid (16, (char *) uuid, return grub_diskfilter_make_raid (16, (char *) uuid,
grub_le_to_cpu32 (sb.raid_disks), buf, grub_le_to_cpu32 (sb.raid_disks), buf,
(sb.size) ? grub_le_to_cpu32 (sb.size) * 2 (sb.size) ? ((grub_disk_addr_t)
grub_le_to_cpu32 (sb.size)) * 2
: sector, : sector,
grub_le_to_cpu32 (sb.chunk_size) >> 9, grub_le_to_cpu32 (sb.chunk_size) >> 9,
grub_le_to_cpu32 (sb.layout), grub_le_to_cpu32 (sb.layout),