diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch')
-rw-r--r-- | poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch deleted file mode 100644 index 325c339b8..000000000 --- a/poky/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 |