proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-21 20:18:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs/hfsplus: Don't fetch a key beyond the end of the node

Browse Source 
Otherwise you get a wild pointer, leading to a bunch of invalid reads.
Check it falls inside the given node.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Axtens 2021-01-22 18:13:56 +11:00 committed by Daniel Kiper
parent b5bc456f66
commit 58ea11d5b9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub-core/fs/hfsplus.c
View File

@ -635,6 +635,10 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
pointer = ((char *) currkey
+ grub_be_to_cpu16 (currkey->keylen)
+ 2);
if ((char *) pointer > node + btree->nodesize - 2)
return grub_error (GRUB_ERR_BAD_FS, "HFS+ key beyond end of node");
currnode = grub_be_to_cpu32 (grub_get_unaligned32 (pointer));
match = 1;
}