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

* grub-core/fs/hfs.c (grub_hfs_mount): Additional filesystem sanity checks.

Browse source
This commit is contained in:
Vladimir Serbinenko 2015-01-20 14:59:40 +01:00
parent 5ed3a5d049
commit 98f74998d5
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/hfs.c (grub_hfs_mount): Additional filesystem
sanity checks.
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com> 2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/minix.c: Additional filesystem * grub-core/fs/minix.c: Additional filesystem

6
grub-core/fs/hfs.c
View file

@ -330,6 +330,7 @@ grub_hfs_mount (grub_disk_t disk)
/* Check if this is a HFS filesystem. */ /* Check if this is a HFS filesystem. */
if (grub_be_to_cpu16 (data->sblock.magic) != GRUB_HFS_MAGIC if (grub_be_to_cpu16 (data->sblock.magic) != GRUB_HFS_MAGIC
|| data->sblock.blksz == 0
|| (data->sblock.blksz & grub_cpu_to_be32_compile_time (0xc00001ff))) || (data->sblock.blksz & grub_cpu_to_be32_compile_time (0xc00001ff)))
{ {
grub_error (GRUB_ERR_BAD_FS, "not an HFS filesystem"); grub_error (GRUB_ERR_BAD_FS, "not an HFS filesystem");
@ -367,6 +368,11 @@ grub_hfs_mount (grub_disk_t disk)
data->cat_root = grub_be_to_cpu32 (treehead.head.root_node); data->cat_root = grub_be_to_cpu32 (treehead.head.root_node);
data->cat_size = grub_be_to_cpu16 (treehead.head.node_size); data->cat_size = grub_be_to_cpu16 (treehead.head.node_size);
if (data->cat_size == 0
|| data->blksz < data->cat_size
|| data->blksz < data->ext_size)
goto fail;
/* Lookup the root directory node in the catalog tree using the /* Lookup the root directory node in the catalog tree using the
volume name. */ volume name. */
key.parent_dir = grub_cpu_to_be32_compile_time (1); key.parent_dir = grub_cpu_to_be32_compile_time (1);