mirror of
https://git.proxmox.com/git/grub2
synced 2025-07-27 02:05:51 +00:00
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>
This commit is contained in:
parent
a201ad17ca
commit
2298f6e0d9
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user