sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

syslinux: fix isohybird overflows on 32 bit system 

When call isohybrid with option '-u', it overflows on a 32 bits host. It
seeks to 512 bytes before the end of the image to install gpt header. If
the size of image is larger than LONG_MAX, it overflows fseek() and
cause error:

isohybrid: wrlinux-image-x86-64-20140505110100.iso: seek error - 8: Invalid argument

Replace fseek with fseeko to fix this issue.

(From OE-Core rev: 41bd9dbf6f3e0add6a9e2cb20cfcbff44d785ea4)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang 2014-06-20 14:06:30 +08:00 committed by Richard Purdie
parent cc480eafe5
commit 3c7b5ec1ca
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch Normal file
View File

@ -0,0 +1,40 @@
Upstream-Status: Backport
Signed-off-by: Kai Kang <kai.kang@windriver.com>
From bc360f8dbdf27bff07bb5db8d0ea9a7b10d8e3d1 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Fri, 20 Jun 2014 11:32:11 +0800
Subject: [PATCH 1/2] isohybrid: fix overflow on 32 bit system
When call isohybrid with option '-u', it overflows on a 32 bits host. It
seeks to 512 bytes before the end of the image to install gpt header. If
the size of image is larger than LONG_MAX, it overflows fseek() and
cause error:
isohybrid: image-x86-64-20140505110100.iso: seek error - 8: Invalid argument
Replace fseek with fseeko to fix this issue.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
utils/isohybrid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/isohybrid.c b/utils/isohybrid.c
index 410bb60..23fc6c0 100644
--- a/utils/isohybrid.c
+++ b/utils/isohybrid.c
@@ -1126,7 +1126,7 @@ main(int argc, char *argv[])
* end of the image
*/
- if (fseek(fp, (isostat.st_size + padding) - orig_gpt_size - 512,
+ if (fseeko(fp, (isostat.st_size + padding) - orig_gpt_size - 512,
SEEK_SET))
err(1, "%s: seek error - 8", argv[0]);
--
1.9.1

4
meta/recipes-devtools/syslinux/syslinux_6.01.bb
View File

@ -13,7 +13,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar
file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \
file://0003-PXELINUX-Add-bios-memscan-function.patch \
file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \
file://syslinux-fix-parallel-building-issue.patch"
file://syslinux-fix-parallel-building-issue.patch \
file://isohybrid-fix-overflow-on-32-bit-system.patch \
"
SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"
SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43"