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

util/glue-efi: Fix incorrect use of a possibly negative value

Browse Source 
It is possible for the ftell() function to return a negative value,
although it is fairly unlikely here, we should be checking for
a negative value before we assign it to an unsigned value.

Fixes: CID 73744

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Darren Kenny 2020-12-04 15:04:28 +00:00 committed by Daniel Kiper
parent 5dc41edc4e
commit 1641d74e16
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/glue-efi.c
View File

@ -39,13 +39,23 @@ write_fat (FILE *in32, FILE *in64, FILE *out, const char *out_filename,
struct grub_macho_fat_header head; struct grub_macho_fat_header head;
struct grub_macho_fat_arch arch32, arch64; struct grub_macho_fat_arch arch32, arch64;
grub_uint32_t size32, size64; grub_uint32_t size32, size64;
long size;
char *buf; char *buf;
fseek (in32, 0, SEEK_END); fseek (in32, 0, SEEK_END);
size32 = ftell (in32); size = ftell (in32);
if (size < 0)
grub_util_error ("cannot get end of input file '%s': %s",
name32, strerror (errno));
size32 = (grub_uint32_t) size;
fseek (in32, 0, SEEK_SET); fseek (in32, 0, SEEK_SET);
fseek (in64, 0, SEEK_END); fseek (in64, 0, SEEK_END);
size64 = ftell (in64); size = ftell (in64);
if (size < 0)
grub_util_error ("cannot get end of input file '%s': %s",
name64, strerror (errno));
size64 = (grub_uint64_t) size;
fseek (in64, 0, SEEK_SET); fseek (in64, 0, SEEK_SET);
head.magic = grub_cpu_to_le32_compile_time (GRUB_MACHO_FAT_EFI_MAGIC); head.magic = grub_cpu_to_le32_compile_time (GRUB_MACHO_FAT_EFI_MAGIC);