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

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

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

11
grub-core/fs/romfs.c
View file

@ -107,10 +107,19 @@ grub_romfs_mount (grub_device_t dev)
grub_error (GRUB_ERR_BAD_FS, "too short filesystem");
return NULL;
}
if (grub_memcmp (sb.sb.magic, GRUB_ROMFS_MAGIC,
sizeof (sb.sb.magic)) != 0)
{
grub_error (GRUB_ERR_BAD_FS, "not romfs");
return NULL;
}
err = do_checksum (&sb, sizeof (sb) < grub_be_to_cpu32 (sb.sb.total_size) ?
sizeof (sb) : grub_be_to_cpu32 (sb.sb.total_size));
if (err)
return NULL;
{
grub_error (GRUB_ERR_BAD_FS, "checksum incorrect");
return NULL;
}
for (ptr = sb.sb.label; (void *) ptr < (void *) (&sb + 1)
&& ptr - sb.d < (grub_ssize_t) grub_be_to_cpu32 (sb.sb.total_size); ptr++)
if (!*ptr)