mirror of
https://git.yoctoproject.org/poky
synced 2026-04-01 05:02:21 +02:00
9be7b4f3db
Affects: <= 2.29.1 (From OE-Core rev: 16cdbc7504cc14547bb99ed742484ae9e658ec6e) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From 30d0157a2ad64e64e5ff9fcc0dbe78a3e682f573 Mon Sep 17 00:00:00 2001
|
|
From: Nick Clifton <nickc@redhat.com>
|
|
Date: Tue, 26 Sep 2017 14:37:47 +0100
|
|
Subject: [PATCH] Avoid needless resource usage when processing a corrupt DWARF
|
|
directory or file name table.
|
|
|
|
PR 22210
|
|
* dwarf2.c (read_formatted_entries): Fail early if we know that
|
|
the loop parsing data entries will overflow the end of the
|
|
section.
|
|
|
|
Upstream-Status: Backport
|
|
Affects: <= 2.29.1
|
|
CVE: CVE-2017-14933 #1
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
bfd/ChangeLog | 7 +++++++
|
|
bfd/dwarf2.c | 10 ++++++++++
|
|
2 files changed, 17 insertions(+)
|
|
|
|
Index: git/bfd/ChangeLog
|
|
===================================================================
|
|
--- git.orig/bfd/ChangeLog
|
|
+++ git/bfd/ChangeLog
|
|
@@ -1,3 +1,10 @@
|
|
+2017-09-26 Nick Clifton <nickc@redhat.com>
|
|
+
|
|
+ PR 22210
|
|
+ * dwarf2.c (read_formatted_entries): Fail early if we know that
|
|
+ the loop parsing data entries will overflow the end of the
|
|
+ section.
|
|
+
|
|
2017-09-26 Alan Modra <amodra@gmail.com>
|
|
|
|
PR 22204
|
|
Index: git/bfd/dwarf2.c
|
|
===================================================================
|
|
--- git.orig/bfd/dwarf2.c
|
|
+++ git/bfd/dwarf2.c
|
|
@@ -1933,6 +1933,17 @@ read_formatted_entries (struct comp_unit
|
|
|
|
data_count = _bfd_safe_read_leb128 (abfd, buf, &bytes_read, FALSE, buf_end);
|
|
buf += bytes_read;
|
|
+
|
|
+ /* PR 22210. Paranoia check. Don't bother running the loop
|
|
+ if we know that we are going to run out of buffer. */
|
|
+ if (data_count > (bfd_vma) (buf_end - buf))
|
|
+ {
|
|
+ _bfd_error_handler (_("Dwarf Error: data count (%Lx) larger than buffer size."),
|
|
+ data_count);
|
|
+ bfd_set_error (bfd_error_bad_value);
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
for (datai = 0; datai < data_count; datai++)
|
|
{
|
|
bfd_byte *format = format_header_data;
|