1*4882a593SmuzhiyunFrom 58ea11d5b9ca0966bd9c68d8ba5240cf7dc3ba83 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Daniel Axtens <dja@axtens.net>
3*4882a593SmuzhiyunDate: Fri, 22 Jan 2021 18:13:56 +1100
4*4882a593SmuzhiyunSubject: [PATCH] fs/hfsplus: Don't fetch a key beyond the end of the node
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunOtherwise you get a wild pointer, leading to a bunch of invalid reads.
7*4882a593SmuzhiyunCheck it falls inside the given node.
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: Daniel Axtens <dja@axtens.net>
10*4882a593SmuzhiyunReviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
11*4882a593SmuzhiyunSigned-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
12*4882a593Smuzhiyun---
13*4882a593Smuzhiyun grub-core/fs/hfsplus.c | 4 ++++
14*4882a593Smuzhiyun 1 file changed, 4 insertions(+)
15*4882a593Smuzhiyun
16*4882a593Smuzhiyundiff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
17*4882a593Smuzhiyunindex 8fe7c12..1c7791b 100644
18*4882a593Smuzhiyun--- a/grub-core/fs/hfsplus.c
19*4882a593Smuzhiyun+++ b/grub-core/fs/hfsplus.c
20*4882a593Smuzhiyun@@ -635,6 +635,10 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
21*4882a593Smuzhiyun 	      pointer = ((char *) currkey
22*4882a593Smuzhiyun 			 + grub_be_to_cpu16 (currkey->keylen)
23*4882a593Smuzhiyun 			 + 2);
24*4882a593Smuzhiyun+
25*4882a593Smuzhiyun+	      if ((char *) pointer > node + btree->nodesize - 2)
26*4882a593Smuzhiyun+		return grub_error (GRUB_ERR_BAD_FS, "HFS+ key beyond end of node");
27*4882a593Smuzhiyun+
28*4882a593Smuzhiyun 	      currnode = grub_be_to_cpu32 (grub_get_unaligned32 (pointer));
29*4882a593Smuzhiyun 	      match = 1;
30*4882a593Smuzhiyun 	    }
31*4882a593Smuzhiyun--
32*4882a593Smuzhiyun2.14.2
33*4882a593Smuzhiyun
34