This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
[PATCH 1/2] Don't overflow in __libdw_in_section
- From: Ulf Hermann <ulf dot hermann at qt dot io>
- To: elfutils-devel at sourceware dot org
- Date: Fri, 8 Dec 2017 15:43:55 +0100
- Subject: [PATCH 1/2] Don't overflow in __libdw_in_section
- Authentication-results: sourceware.org; auth=none
- Authentication-results: spf=none (sender IP is ) smtp.mailfrom=ulf dot hermann at qt dot io;
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=xpBlwtkWcMjK1onfSUtd7xMa+XAEQwwV+gmtl6rTmOA=; b=sN1VxzzCFXUgpH/H2jAJ75hNtBWr9/Fo0jpL3j/EJl2rQd1MLhoCCMAWSAH4o+shMl/Gi8WX0h50sWs+xnLKOfFe8/mNinQiFs/RuZl5mJsRPYltfzHuFUn0MW7g53VKdrBSNwlHvuBtu/MRszPsI20Y9Qg+W5IiuRMb8OMAP9w=
- Spamdiagnosticmetadata: NSPM
- Spamdiagnosticoutput: 1:99
This exposes a bug in dwarf_formstring as detected by the
dwarf-getmacros test. We cannot unconditionally assume that a string is
in either the IDX_debug_info or the IDX_debug_types section as
determined by cu_sec_idx.
Change-Id: I6544d42b719587dd94330db484512bde6ce34e55
---
libdw/ChangeLog | 4 ++++
libdw/libdwP.h | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 4375244..996cd2e 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-09 Ulf Hermann <ulf.hermann@qt.io>
+
+ * libdwP.h: Fix check for the upper border of the range in
__libdw_in_section.
+
2017-11-03 Mark Wielaard <mark@klomp.org>
* dwarf_getlocation.c (__libdw_intern_expression): Handle
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 78c0013..e092d8e 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -643,7 +643,8 @@ __libdw_in_section (Dwarf *dbg, int sec_index,
if (data == NULL)
return false;
if (unlikely (addr < data->d_buf)
- || unlikely (data->d_size - (addr - data->d_buf) < size))
+ || unlikely (data->d_size < size)
+ || unlikely ((size_t)(addr - data->d_buf) > data->d_size - size))
{
__libdw_seterrno (DWARF_E_INVALID_OFFSET);
return false;
--
2.8.1.windows.1