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
Download patch file Download diff file Expand all files Collapse all files

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

@ -192,6 +192,11 @@ grub_mdraid_detect (grub_disk_t disk,
/* Unsupported version. */
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. */
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));
return grub_diskfilter_make_raid (16, (char *) uuid,
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,
grub_le_to_cpu32 (sb.chunk_size) >> 9,
grub_le_to_cpu32 (sb.layout),