* grub-core/fs/bfs.c (mount): Improve filesystem detection reliability.

* grub-core/fs/ext2.c (grub_ext2_mount): Likewise.
	* grub-core/fs/hfs.c (grub_hfs_mount): Likewise.
	* grub-core/fs/hfsplus.c (grub_hfsplus_mount): Likewise.
	* grub-core/fs/jfs.c (grub_jfs_mount): Likewise.
	* grub-core/fs/minix.c (grub_minix_mount): Likewise.
	* grub-core/fs/ntfs.c (grub_ntfs_mount): Likewise.
	* grub-core/fs/romfs.c (grub_romfs_mount): Likewise.
	* grub-core/fs/xfs.c (grub_xfs_mount): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-12 13:31:05 +02:00
parent fe8c2f1117
commit 2e57f28fc7
10 changed files with 63 additions and 18 deletions

View file

@ -483,9 +483,9 @@ grub_minix_mount (grub_disk_t disk)
if (data->sblock.magic == grub_cpu_to_minix16_compile_time (GRUB_MINIX_MAGIC))
{
#if !defined(MODE_MINIX3)
data->filename_size = 14;
data->filename_size = 14;
#else
data->filename_size = 60;
data->filename_size = 60;
#endif
}
#if !defined(MODE_MINIX3)
@ -496,6 +496,11 @@ grub_minix_mount (grub_disk_t disk)
else
goto fail;
/* 20 means 1G zones. We could support up to 31 but already 1G isn't
supported by anything else. */
if (grub_minix_to_cpu16 (data->sblock.log2_zone_size) >= 20)
goto fail;
data->disk = disk;
data->linknest = 0;
#ifdef MODE_MINIX3