1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- From 2298f6e0d951251bb9ca97d891d1bc8b74515f8c Mon Sep 17 00:00:00 2001
- From: Darren Kenny <darren.kenny@oracle.com>
- Date: Fri, 23 Oct 2020 17:09:31 +0000
- Subject: [PATCH] hfsplus: Check that the volume name length is valid
- HFS+ documentation suggests that the maximum filename and volume name is
- 255 Unicode characters in length.
- So, when converting from big-endian to little-endian, we should ensure
- that the name of the volume has a length that is between 0 and 255,
- inclusive.
- Fixes: CID 73641
- Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
- Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
- Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
- ---
- grub-core/fs/hfsplus.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
- diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
- index 9c4e4c8..8fe7c12 100644
- --- a/grub-core/fs/hfsplus.c
- +++ b/grub-core/fs/hfsplus.c
- @@ -1012,6 +1012,15 @@ grub_hfsplus_label (grub_device_t device, char **label)
- grub_hfsplus_btree_recptr (&data->catalog_tree, node, ptr);
-
- label_len = grub_be_to_cpu16 (catkey->namelen);
- +
- + /* Ensure that the length is >= 0. */
- + if (label_len < 0)
- + label_len = 0;
- +
- + /* Ensure label length is at most 255 Unicode characters. */
- + if (label_len > 255)
- + label_len = 255;
- +
- label_name = grub_calloc (label_len, sizeof (*label_name));
- if (!label_name)
- {
- --
- 2.14.2
|