From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Sat, 9 Jan 2016 18:05:44 +0000 (+0300)
Subject: mkimage: fix unintended sign extension
X-Git-Tag: 2.02-beta3~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=670c43af27dee281bb61e2a50855b61f96b7e1fa;p=thirdparty%2Fgrub.git

mkimage: fix unintended sign extension

Found by: Coverity scan.
CID: 73691, 73717
---

diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index a1ddc6269..0e0c6f7a1 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -1465,7 +1465,7 @@ SUFFIX (load_image) (const char *kernel_path, size_t *exec_size,
   section_entsize = grub_target_to_host16 (e->e_shentsize);
   num_sections = grub_target_to_host16 (e->e_shnum);
 
-  if (kernel_size < section_offset + section_entsize * num_sections)
+  if (kernel_size < section_offset + (grub_uint32_t) section_entsize * num_sections)
     grub_util_error (_("premature end of file %s"), kernel_path);
 
   sections = (Elf_Shdr *) (kernel_img + section_offset);