summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-04 13:18:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-05 13:53:48 +0000
commitdb9bca2b3b126ad915decc1c803e136a3cdb5d66 (patch)
tree3fab2b7ec10ee8397268827ed03a9396715188ed /meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
parent3c6764b09888e2025536b8bc73ce548cf53a1579 (diff)
downloadpoky-db9bca2b3b126ad915decc1c803e136a3cdb5d66.tar.gz
binutils: Upgrade to binutils 2.32
Changes https://sourceware.org/ml/binutils/2019-02/msg00010.html 0007-Add-the-armv5e-architecture-to-binutils.patch is dropped since we armv5 is not a used option anymore in OE armv5te is default, and gcc9 will drop it completely anyway CVE patches were backports from master which is already past of 2.32 release Other dropped patches were partial or full backports as well (From OE-Core rev: b71294c4decf35d544a2c8adb4e67d141841fc68) Signed-off-by: Khem Raj <raj.khem@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.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
deleted file mode 100644
index 325c339b88..0000000000
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 45a0eaf77022963d639d6d19871dbab7b79703fc Mon Sep 17 00:00:00 2001
2From: Alan Modra <amodra@gmail.com>
3Date: Tue, 23 Oct 2018 19:02:06 +1030
4Subject: [PATCH] PR23806, NULL pointer dereference in merge_strings
5
6 PR 23806
7 * merge.c (_bfd_add_merge_section): Don't attempt to merge
8 sections with ridiculously large alignments.
9
10Upstream-Status: Backport
11CVE: CVE-2018-18606
12Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
13---
14 bfd/ChangeLog | 6 ++++++
15 bfd/merge.c | 15 +++++++++++----
16 2 files changed, 17 insertions(+), 4 deletions(-)
17
18--- a/bfd/merge.c
19+++ b/bfd/merge.c
20@@ -24,6 +24,7 @@
21 as used in ELF SHF_MERGE. */
22
23 #include "sysdep.h"
24+#include <limits.h>
25 #include "bfd.h"
26 #include "elf-bfd.h"
27 #include "libbfd.h"
28@@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void
29 return TRUE;
30 }
31
32- align = sec->alignment_power;
33- if ((sec->entsize < (unsigned) 1 << align
34+#ifndef CHAR_BIT
35+#define CHAR_BIT 8
36+#endif
37+ if (sec->alignment_power >= sizeof (align) * CHAR_BIT)
38+ return TRUE;
39+
40+ align = 1u << sec->alignment_power;
41+ if ((sec->entsize < align
42 && ((sec->entsize & (sec->entsize - 1))
43 || !(sec->flags & SEC_STRINGS)))
44- || (sec->entsize > (unsigned) 1 << align
45- && (sec->entsize & (((unsigned) 1 << align) - 1))))
46+ || (sec->entsize > align
47+ && (sec->entsize & (align - 1))))
48 {
49 /* Sanity check. If string character size is smaller than
50 alignment, then we require character size to be a power