diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-12-26 12:09:54 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 16:38:31 +0000 |
commit | 798f11f079371899c4082817b17a2754d3f358c9 (patch) | |
tree | de20f4d351c0a56f2f2a059febb87236f781c278 /meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | |
parent | 625ae4a70bdcef6f4959fccbd41a8cba753827c8 (diff) | |
download | poky-798f11f079371899c4082817b17a2754d3f358c9.tar.gz |
binutils: Upgrade to latest on 2.31 release branch
* Append minor version to PV so recipe checker is happy
* Drop upstreamed patches
* Remove changelog from CVE patches, they dont apply and are in patch
log anyway
(From OE-Core rev: 550085bc092d773c8c481e238d0d3210466166dc)
(From OE-Core rev: 27b9008618fa981d12424eecbff9bbf113b735f7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch index 35cf328a14..325c339b88 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | |||
@@ -15,24 +15,6 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | |||
15 | bfd/merge.c | 15 +++++++++++---- | 15 | bfd/merge.c | 15 +++++++++++---- |
16 | 2 files changed, 17 insertions(+), 4 deletions(-) | 16 | 2 files changed, 17 insertions(+), 4 deletions(-) |
17 | 17 | ||
18 | diff --git a/bfd/ChangeLog b/bfd/ChangeLog | ||
19 | index 1f3fc1c..c5f7ec7 100644 | ||
20 | --- a/bfd/ChangeLog | ||
21 | +++ b/bfd/ChangeLog | ||
22 | @@ -1,5 +1,11 @@ | ||
23 | 2018-10-23 Alan Modra <amodra@gmail.com> | ||
24 | |||
25 | + PR 23806 | ||
26 | + * merge.c (_bfd_add_merge_section): Don't attempt to merge | ||
27 | + sections with ridiculously large alignments. | ||
28 | + | ||
29 | +2018-10-23 Alan Modra <amodra@gmail.com> | ||
30 | + | ||
31 | PR 23804 | ||
32 | * merge.c (_bfd_add_merge_section): Don't attempt to merge | ||
33 | sections where size is not a multiple of entsize. | ||
34 | diff --git a/bfd/merge.c b/bfd/merge.c | ||
35 | index 5e3bba0..7de0c88 100644 | ||
36 | --- a/bfd/merge.c | 18 | --- a/bfd/merge.c |
37 | +++ b/bfd/merge.c | 19 | +++ b/bfd/merge.c |
38 | @@ -24,6 +24,7 @@ | 20 | @@ -24,6 +24,7 @@ |
@@ -43,7 +25,7 @@ index 5e3bba0..7de0c88 100644 | |||
43 | #include "bfd.h" | 25 | #include "bfd.h" |
44 | #include "elf-bfd.h" | 26 | #include "elf-bfd.h" |
45 | #include "libbfd.h" | 27 | #include "libbfd.h" |
46 | @@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec, | 28 | @@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void |
47 | return TRUE; | 29 | return TRUE; |
48 | } | 30 | } |
49 | 31 | ||
@@ -66,5 +48,3 @@ index 5e3bba0..7de0c88 100644 | |||
66 | { | 48 | { |
67 | /* Sanity check. If string character size is smaller than | 49 | /* Sanity check. If string character size is smaller than |
68 | alignment, then we require character size to be a power | 50 | alignment, then we require character size to be a power |
69 | -- | ||
70 | 2.9.3 | ||