diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-08 00:11:40 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-08 10:53:09 +0100 |
commit | 2be79f0b1d0d53b8750d28013543b7ee853c1b42 (patch) | |
tree | f3586a5ff28b61c572df87938881ce3455f72cd9 /meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch | |
parent | b3b6cfb48bb61f2efdd5c2325fcce3209b7894c7 (diff) | |
download | poky-2be79f0b1d0d53b8750d28013543b7ee853c1b42.tar.gz |
binutils: upgrade to 2.25
* Remove the following patches since they are already in the new code:
binutils/fix-pr15815.patch
binutils/fix-pr16428.patch
binutils/fix-pr16476.patch
binutils/fix-pr2404.patch
binutils/replace_macros_with_static_inline.patch
binutils/binutils_CVE-2014-8484.patch
binutils/binutils_CVE-2014-8485.patch
binutils/binutils_CVE-2014-8501.patch
binutils/binutils_CVE-2014-8502.patch
binutils/binutils_CVE-2014-8502_1.patch
binutils/binutils_CVE-2014-8503.patch
binutils/binutils_CVE-2014-8504.patch
binutils/binutils_CVE-2014-8737.patch
* The file src-release is gone.
* Updated patches for the new code.
(From OE-Core rev: a8446ea78daa5875de43eb5bcccd8f536ea07e1c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Conflicts:
meta/conf/distro/include/tcmode-default.inc
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch b/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch deleted file mode 100644 index e789499477..0000000000 --- a/meta/recipes-devtools/binutils/binutils/binutils_CVE-2014-8484.patch +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | CVE-2014-8484 fix. | ||
4 | |||
5 | [YOCTO #7084] | ||
6 | |||
7 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
8 | |||
9 | From bd25671c6f202c4a5108883caa2adb24ff6f361f Mon Sep 17 00:00:00 2001 | ||
10 | From: Alan Modra <amodra@gmail.com> | ||
11 | Date: Fri, 29 Aug 2014 10:36:29 +0930 | ||
12 | Subject: [PATCH] Report an error for S-records with less than the miniumum | ||
13 | size | ||
14 | |||
15 | * srec.c (srec_scan): Revert last change. Report an error for | ||
16 | S-records with less than the miniumum byte count. | ||
17 | --- | ||
18 | bfd/ChangeLog | 5 +++++ | ||
19 | bfd/srec.c | 18 +++++++++++++++--- | ||
20 | 2 files changed, 20 insertions(+), 3 deletions(-) | ||
21 | |||
22 | Index: binutils-2.24/bfd/srec.c | ||
23 | =================================================================== | ||
24 | --- binutils-2.24.orig/bfd/srec.c | ||
25 | +++ binutils-2.24/bfd/srec.c | ||
26 | @@ -455,7 +455,7 @@ srec_scan (bfd *abfd) | ||
27 | { | ||
28 | file_ptr pos; | ||
29 | char hdr[3]; | ||
30 | - unsigned int bytes; | ||
31 | + unsigned int bytes, min_bytes; | ||
32 | bfd_vma address; | ||
33 | bfd_byte *data; | ||
34 | unsigned char check_sum; | ||
35 | @@ -478,6 +478,19 @@ srec_scan (bfd *abfd) | ||
36 | } | ||
37 | |||
38 | check_sum = bytes = HEX (hdr + 1); | ||
39 | + min_bytes = 3; | ||
40 | + if (hdr[0] == '2' || hdr[0] == '8') | ||
41 | + min_bytes = 4; | ||
42 | + else if (hdr[0] == '3' || hdr[0] == '7') | ||
43 | + min_bytes = 5; | ||
44 | + if (bytes < min_bytes) | ||
45 | + { | ||
46 | + (*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"), | ||
47 | + abfd, lineno, bytes); | ||
48 | + bfd_set_error (bfd_error_bad_value); | ||
49 | + goto error_return; | ||
50 | + } | ||
51 | + | ||
52 | if (bytes * 2 > bufsize) | ||
53 | { | ||
54 | if (buf != NULL) | ||
55 | Index: binutils-2.24/bfd/ChangeLog | ||
56 | =================================================================== | ||
57 | --- binutils-2.24.orig/bfd/ChangeLog | ||
58 | +++ binutils-2.24/bfd/ChangeLog | ||
59 | @@ -1,3 +1,8 @@ | ||
60 | +2014-08-29 Alan Modra <amodra@gmail.com> | ||
61 | + | ||
62 | + * srec.c (srec_scan): Revert last change. Report an error for | ||
63 | + S-records with less than the miniumum byte count. | ||
64 | + | ||
65 | 2013-12-02 Tristan Gingold <gingold@adacore.com> | ||
66 | |||
67 | * configure.in: Bump version to 2.24 | ||