diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-12-10 10:26:33 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-07 23:35:08 +0000 |
commit | c4fc5641d3f994b91d685fac2602efd112a0a6a9 (patch) | |
tree | 86162b99b1839e973a4abce31c4c836b4a94e4d1 /meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch | |
parent | 31059be9777b6f452bfdaafc56d3fd3ad7fd0c65 (diff) | |
download | poky-c4fc5641d3f994b91d685fac2602efd112a0a6a9.tar.gz |
syslinux: Update to 6.0.3
Removed patches that are now committed upstream, rebase parallel make
patch and add a new patch to remove a script that was calling git during
the clean process.
(From OE-Core rev: b53e46bece1c4976ba146d9abf41a8a54c584300)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch')
-rw-r--r-- | meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch b/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch deleted file mode 100644 index 09a6945ba9..0000000000 --- a/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
4 | |||
5 | From bc360f8dbdf27bff07bb5db8d0ea9a7b10d8e3d1 Mon Sep 17 00:00:00 2001 | ||
6 | From: Kai Kang <kai.kang@windriver.com> | ||
7 | Date: Fri, 20 Jun 2014 11:32:11 +0800 | ||
8 | Subject: [PATCH 1/2] isohybrid: fix overflow on 32 bit system | ||
9 | |||
10 | When call isohybrid with option '-u', it overflows on a 32 bits host. It | ||
11 | seeks to 512 bytes before the end of the image to install gpt header. If | ||
12 | the size of image is larger than LONG_MAX, it overflows fseek() and | ||
13 | cause error: | ||
14 | |||
15 | isohybrid: image-x86-64-20140505110100.iso: seek error - 8: Invalid argument | ||
16 | |||
17 | Replace fseek with fseeko to fix this issue. | ||
18 | |||
19 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
20 | Signed-off-by: H. Peter Anvin <hpa@zytor.com> | ||
21 | --- | ||
22 | utils/isohybrid.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/utils/isohybrid.c b/utils/isohybrid.c | ||
26 | index 410bb60..23fc6c0 100644 | ||
27 | --- a/utils/isohybrid.c | ||
28 | +++ b/utils/isohybrid.c | ||
29 | @@ -1126,7 +1126,7 @@ main(int argc, char *argv[]) | ||
30 | * end of the image | ||
31 | */ | ||
32 | |||
33 | - if (fseek(fp, (isostat.st_size + padding) - orig_gpt_size - 512, | ||
34 | + if (fseeko(fp, (isostat.st_size + padding) - orig_gpt_size - 512, | ||
35 | SEEK_SET)) | ||
36 | err(1, "%s: seek error - 8", argv[0]); | ||
37 | |||
38 | -- | ||
39 | 1.9.1 | ||
40 | |||