diff options
| author |   ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
|---|---|---|
| committer | ToshikazuOhiwa <toshikazu_ohiwa@mail.toyota.co.jp> | 2020-03-30 09:24:26 +0900 |
| commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
| tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | |
| parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) | |
agl-basesystem
Diffstat (limited to 'external/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch')
| -rw-r--r-- | external/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/external/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch new file mode 100644 index 00000000..325c339b --- /dev/null +++ b/external/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch @@ -0,0 +1,50 @@ +From 45a0eaf77022963d639d6d19871dbab7b79703fc Mon Sep 17 00:00:00 2001 +From: Alan Modra <amodra@gmail.com> +Date: Tue, 23 Oct 2018 19:02:06 +1030 +Subject: [PATCH] PR23806, NULL pointer dereference in merge_strings + + PR 23806 + * merge.c (_bfd_add_merge_section): Don't attempt to merge + sections with ridiculously large alignments. + +Upstream-Status: Backport +CVE: CVE-2018-18606 +Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> +--- + bfd/ChangeLog | 6 ++++++ + bfd/merge.c | 15 +++++++++++---- + 2 files changed, 17 insertions(+), 4 deletions(-) + +--- a/bfd/merge.c ++++ b/bfd/merge.c +@@ -24,6 +24,7 @@ + as used in ELF SHF_MERGE. */ + + #include "sysdep.h" ++#include <limits.h> + #include "bfd.h" + #include "elf-bfd.h" + #include "libbfd.h" +@@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void + return TRUE; + } + +- align = sec->alignment_power; +- if ((sec->entsize < (unsigned) 1 << align ++#ifndef CHAR_BIT ++#define CHAR_BIT 8 ++#endif ++ if (sec->alignment_power >= sizeof (align) * CHAR_BIT) ++ return TRUE; ++ ++ align = 1u << sec->alignment_power; ++ if ((sec->entsize < align + && ((sec->entsize & (sec->entsize - 1)) + || !(sec->flags & SEC_STRINGS))) +- || (sec->entsize > (unsigned) 1 << align +- && (sec->entsize & (((unsigned) 1 << align) - 1)))) ++ || (sec->entsize > align ++ && (sec->entsize & (align - 1)))) + { + /* Sanity check. If string character size is smaller than + alignment, then we require character size to be a power |