proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-14 14:42:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs: Fix block lists not being able to address to end of disk sometimes

Browse Source 
When checking if a block list goes past the end of the disk, make sure
the total size of the disk is in GRUB native sector sizes, otherwise there
will be blocks at the end of the disk inaccessible by block lists.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Glenn Washburn 2020-11-23 03:27:42 -06:00 committed by Daniel Kiper
parent 505d92f5e7
commit 8919eecd84
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)
unsigned i;
grub_disk_t disk = file->device->disk;
struct grub_fs_block *blocks;
grub_size_t max_sectors;
/* First, count the number of blocks. */
do
@ -156,6 +157,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)
return 0;
file->size = 0;
max_sectors = grub_disk_from_native_sector (disk, disk->total_sectors);
p = (char *) name;
for (i = 0; i < num; i++)
{
@ -181,7 +183,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)
goto fail;
}
if (disk->total_sectors < blocks[i].offset + blocks[i].length)
if (max_sectors < blocks[i].offset + blocks[i].length)
{
grub_error (GRUB_ERR_BAD_FILENAME, "beyond the total sectors");
goto fail;