* grub-core/fs/cbfs.c: Don't probe disks of unknow size.

Fixes hang on virtualbox.
This commit is contained in:
Vladimir Serbinenko 2014-08-10 09:50:36 +02:00
parent 0901e7855f
commit 33f6ce671f
2 changed files with 7 additions and 0 deletions

View file

@ -1,3 +1,7 @@
2014-08-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/cbfs.c: Don't probe disks of unknow size.
2014-07-08 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/10_hurd.in: Make kernel list progression not fail on

View file

@ -149,6 +149,9 @@ grub_cbfs_mount (grub_disk_t disk)
grub_off_t header_off;
struct cbfs_header head;
if (grub_disk_get_size (disk) == GRUB_DISK_SIZE_UNKNOWN)
goto fail;
if (grub_disk_read (disk, grub_disk_get_size (disk) - 1,
GRUB_DISK_SECTOR_SIZE - sizeof (ptr),
sizeof (ptr), &ptr))