aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-10-02 12:12:58 +0300
committerEfraim Flashner <efraim@flashner.co.il>2017-10-02 12:13:39 +0300
commit3097edf54966442b90f8ff65cb83425187a74d54 (patch)
treef01da51f0f3602abd54adb2dabae892cff4e8615 /gnu/packages
parentb33c255d4db6a1e5d278629d9fbc508a73726d37 (diff)
downloadguix-3097edf54966442b90f8ff65cb83425187a74d54.tar
guix-3097edf54966442b90f8ff65cb83425187a74d54.tar.gz
gnu: binutils: Update to 2.29.1.
* gnu/packages/base.scm (binutils): Update to 2.29.1. [source]: Add patch. * gnu/packages/patches/binutils-CVE-2017-14729.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/base.scm7
-rw-r--r--gnu/packages/patches/binutils-CVE-2017-14729.patch58
2 files changed, 62 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 20f5ab7de6..7b5b5f87d7 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -393,15 +393,16 @@ change. GNU make offers many powerful extensions over the standard utility.")
(define-public binutils
(package
(name "binutils")
- (version "2.28.1")
+ (version "2.29.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/binutils/binutils-"
version ".tar.bz2"))
(sha256
(base32
- "1sj234nd05cdgga1r36zalvvdkvpfbr12g5mir2n8i1dwsdrj939"))
- (patches (search-patches "binutils-ld-new-dtags.patch"
+ "1k2mziqn0pbxpxnkwxrl824xnmivcqdkb0insap71yv92gsdy28m"))
+ (patches (search-patches "binutils-CVE-2017-14729.patch"
+ "binutils-ld-new-dtags.patch"
"binutils-loongson-workaround.patch"))))
(build-system gnu-build-system)
diff --git a/gnu/packages/patches/binutils-CVE-2017-14729.patch b/gnu/packages/patches/binutils-CVE-2017-14729.patch
new file mode 100644
index 0000000000..ccf3d3570e
--- /dev/null
+++ b/gnu/packages/patches/binutils-CVE-2017-14729.patch
@@ -0,0 +1,58 @@
+https://blogs.gentoo.org/ago/2017/09/25/binutils-heap-based-buffer-overflow-in-_bfd_x86_elf_get_synthetic_symtab-elfxx-x86-c/
+
+this patch is modified slightly to apply to our binutils
+
+From 56933f9e3e90eebf1018ed7417d6c1184b91db6b Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Fri, 22 Sep 2017 14:15:40 -0700
+Subject: [PATCH] x86: Guard against corrupted PLT
+
+There should be only one entry in PLT for a given symbol. Set howto to
+NULL after processing a PLT entry to guard against corrupted PLT so that
+the duplicated PLT entries are skipped.
+
+ PR binutils/22170
+ * elf32-i386.c (elf_i386_get_synthetic_symtab): Guard against
+ corrupted PLT.
+ * elf64-x86-64.c (elf_x86_64_get_synthetic_symtab): Likewise.
+
+(cherry picked from commit 61e3bf5f83f7e505b6bc51ef65426e5b31e6e360)
+---
+ bfd/ChangeLog | 7 +++++++
+ bfd/elf32-i386.c | 4 ++++
+ bfd/elf64-x86-64.c | 4 ++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 9dc2d25..ba50c93 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -6616,6 +6616,10 @@ bad_return:
+ size += sizeof ("+0x") - 1 + 8;
+ n++;
+ s++;
++ /* There should be only one entry in PLT for a given
++ symbol. Set howto to NULL after processing a PLT
++ entry to guard against corrupted PLT. */
++ p->howto = NULL;
+ }
+ offset += plt_entry_size;
+ }
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index 558db98..d9225ad 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -6970,6 +6970,10 @@ bad_return:
+ size += sizeof ("+0x") - 1 + 8 + 8 * ABI_64_P (abfd);
+ n++;
+ s++;
++ /* There should be only one entry in PLT for a given
++ symbol. Set howto to NULL after processing a PLT
++ entry to guard against corrupted PLT. */
++ p->howto = NULL;
+ }
+ offset += plt_entry_size;
+ }
+--
+2.9.3
+