Binutils: Security fix for CVE-2018-10372

Affects: <= 2.30

(From OE-Core rev: 8d254fe04992aed29a2c8ecbf99e91d0167449ce)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster 2018-08-08 11:10:29 -07:00 committed by Richard Purdie
parent e82b9a5096
commit 2d7d54a5c5
2 changed files with 59 additions and 0 deletions

View File

@ -65,6 +65,7 @@ SRC_URI = "\
file://CVE-2017-17122.patch \
file://CVE-2017-17125.patch \
file://CVE-2017-17123.patch \
file://CVE-2018-10372.patch \
"
S = "${WORKDIR}/git"

View File

@ -0,0 +1,58 @@
From 6aea08d9f3e3d6475a65454da488a0c51f5dc97d Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 17 Apr 2018 12:35:55 +0100
Subject: [PATCH] Fix illegal memory access when parsing corrupt DWARF
information.
PR 23064
* dwarf.c (process_cu_tu_index): Test for a potential buffer
overrun before copying signature pointer.
Upstream-Status: Backport
Affects: <= 2.30
CVE: CVE-2018-10372
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
binutils/ChangeLog | 6 ++++++
binutils/dwarf.c | 13 ++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
Index: git/binutils/dwarf.c
===================================================================
--- git.orig/binutils/dwarf.c
+++ git/binutils/dwarf.c
@@ -8526,7 +8526,18 @@ process_cu_tu_index (struct dwarf_sectio
}
if (!do_display)
- memcpy (&this_set[row - 1].signature, ph, sizeof (uint64_t));
+ {
+ size_t num_copy = sizeof (uint64_t);
+
+ /* PR 23064: Beware of buffer overflow. */
+ if (ph + num_copy < limit)
+ memcpy (&this_set[row - 1].signature, ph, num_copy);
+ else
+ {
+ warn (_("Signature (%p) extends beyond end of space in section\n"), ph);
+ return 0;
+ }
+ }
prow = poffsets + (row - 1) * ncols * 4;
/* PR 17531: file: b8ce60a8. */
Index: git/binutils/ChangeLog
===================================================================
--- git.orig/binutils/ChangeLog
+++ git/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-17 Nick Clifton <nickc@redhat.com>
+
+ PR 23064
+ * dwarf.c (process_cu_tu_index): Test for a potential buffer
+ overrun before copying signature pointer.
+
2017-11-18 Alan Modra <amodra@gmail.com>
PR 22443